diff --git a/DESCRIPTION b/DESCRIPTION
index c5a28345ba5db1e7f00a9bcffeac83620b224551..bdd74e17453423fa80d336be9803424ad9d5549f 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGRteaching
 Type: Package
 Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
-Version: 0.1.11.1
+Version: 0.1.11.2
 Date: 2018-01-29
 Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
 Depends: airGR (>= 1.0.9.43)
diff --git a/R/CalGR.R b/R/CalGR.R
index d6655a0f8eee4b312389c5479416a7052b34f633..dc549eaddc60c5fc2db3c7a8b4618c06bd537ba8 100644
--- a/R/CalGR.R
+++ b/R/CalGR.R
@@ -11,7 +11,7 @@ CalGR <- function(PrepGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
     if (any(is.na(WupPer))) {
       stop("Non convenient date format for the warm-up period \"WupPer\"")
     } else {
-      if (! (any(PrepGR$InputsModel$DatesR == WupPer[1]) & any(PrepGR$InputsModel$DatesR == WupPer[2]))) {
+      if (!any(PrepGR$InputsModel$DatesR == WupPer[1]) | !any(PrepGR$InputsModel$DatesR == WupPer[2])) {
         stop("Non convenient date for the warm-up period \"WupPer\"")
       } else {
         WupInd <- which(PrepGR$InputsModel$DatesR == WupPer[1]):which(PrepGR$InputsModel$DatesR == WupPer[2])
@@ -23,7 +23,7 @@ CalGR <- function(PrepGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
   if (any(is.na(CalPer))) {
     stop("Non convenient date format for the calibration period \"CalPer\"")
   } else {
-    if (! (any(PrepGR$InputsModel$DatesR == CalPer[1]) & any(PrepGR$InputsModel$DatesR == CalPer[2]))) {
+    if (!any(PrepGR$InputsModel$DatesR == CalPer[1]) | !any(PrepGR$InputsModel$DatesR == CalPer[2])) {
       stop("Non convenient date for the calibration period \"CalPer\"")
     } else {
       CalInd <- which(PrepGR$InputsModel$DatesR == CalPer[1]):which(PrepGR$InputsModel$DatesR == CalPer[2])
diff --git a/R/SimGR.R b/R/SimGR.R
index bb7a5d7d4e8a721dee040ffc8aaeabc6445413ea..20812d53b8875458e46a6b9b8156c9e00ad3a6e7 100644
--- a/R/SimGR.R
+++ b/R/SimGR.R
@@ -22,7 +22,7 @@ SimGR <- function(PrepGR, CalGR = NULL, Param = NULL, EffCrit = c("NSE", "KGE",
     if (any(is.na(WupPer))) {
       stop("Non convenient date format for the warm-up period \"WupPer\"")
     } else {
-      if (! (any(PrepGR$InputsModel$DatesR == WupPer[1]) & any(PrepGR$InputsModel$DatesR == WupPer[1]))) {
+      if (!any(PrepGR$InputsModel$DatesR == WupPer[1]) | !any(PrepGR$InputsModel$DatesR == WupPer[2])) {
         stop("Non convenient date for the warm-up period \"WupPer\"")
       } else {
         WupInd <- which(PrepGR$InputsModel$DatesR == WupPer[1]):which(PrepGR$InputsModel$DatesR == WupPer[2])
@@ -34,7 +34,7 @@ SimGR <- function(PrepGR, CalGR = NULL, Param = NULL, EffCrit = c("NSE", "KGE",
   if (any(is.na(SimPer))) {
     stop("Non convenient date format for the simulation period \"SimPer\"")
   } else {
-    if (! (any(PrepGR$InputsModel$DatesR == SimPer[1]) & any(PrepGR$InputsModel$DatesR == SimPer[2]))) {
+    if (!any(PrepGR$InputsModel$DatesR == SimPer[1]) | !any(PrepGR$InputsModel$DatesR == SimPer[2])) {
       stop("Non convenient date for the simulation period \"SimPer\"")
     } else {
       SimInd <- which(PrepGR$InputsModel$DatesR == SimPer[1]):which(PrepGR$InputsModel$DatesR == SimPer[2])