diff --git a/DESCRIPTION b/DESCRIPTION
index 0974026234fe67a478be4ff6727a93d987eb7fd7..bf61cd205c2036edee09fd8bc734ff9a64874ec2 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.3.58
+Version: 1.6.3.59
 Date: 2020-11-16
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 1307e01ada64410a17953a16f119b6a54b20f615..1453cbd2aec40a170f33582e5724ade045508b4e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
 
 
 
-### 1.6.3.58 Release Notes (2020-11-16)
+### 1.6.3.59 Release Notes (2020-11-16)
 
 #### New features
 
diff --git a/R/RunModel_GR2M.R b/R/RunModel_GR2M.R
index ab6ab67be91245c540e2412945a00e3c3b0543cf..65d5e1a30f5dc8606ffad8c3cb57d8584fa8262e 100644
--- a/R/RunModel_GR2M.R
+++ b/R/RunModel_GR2M.R
@@ -97,19 +97,19 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                        lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                        list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R
index 38d0cfd559fa7c044fb565b3f3a1c47b85b7f9a9..7090844b790b778a27b4759fc5025a559ae16e0f 100644
--- a/R/RunModel_GR4H.R
+++ b/R/RunModel_GR4H.R
@@ -102,19 +102,19 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R
index 96e8cc715cf3b2c2112c7169dbf6c4a01daf40c9..9720662a855bda64465fb6b0108e993221ae727a 100644
--- a/R/RunModel_GR4J.R
+++ b/R/RunModel_GR4J.R
@@ -101,19 +101,19 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_StateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR5H.R b/R/RunModel_GR5H.R
index cf2cce4ce720ccceb73a239cd636981d6c964a7e..e0f70bd11d8335854724ea11089ee82becd488e5 100644
--- a/R/RunModel_GR5H.R
+++ b/R/RunModel_GR5H.R
@@ -112,19 +112,19 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_StateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_StateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R
index edd304c2305243d6836cdb2a6f88c410df58b2ef..1af193e518864a3021dd2cb054a57a75cc6e181e 100644
--- a/R/RunModel_GR5J.R
+++ b/R/RunModel_GR5J.R
@@ -102,19 +102,19 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R
index 376604a62644659cc99a9e81d94d0802a388fd85..46e5fc8da26e2bdfe7874e40cfdbc2ccda26dd98 100644
--- a/R/RunModel_GR6J.R
+++ b/R/RunModel_GR6J.R
@@ -107,19 +107,19 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
     names(OutputsModel) <- FortranOutputs[IndOutputs]
   }
   ## DatesR_and_OutputsModel_only
-  if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
+  if (ExportDatesR & ExportStateEnd == FALSE) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
     names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
   }
   ## OutputsModel_and_SateEnd_only
-  if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
+  if (ExportDatesR == FALSE & ExportStateEnd) {
     OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))
     names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
   }
   ## DatesR_and_OutputsModel_and_SateEnd
-  if ((ExportDatesR == TRUE & ExportStateEnd == TRUE) | "all" %in% RunOptions$Outputs_Sim) {
+  if ((ExportDatesR & ExportStateEnd) | "all" %in% RunOptions$Outputs_Sim) {
     OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]), 
                       lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]), 
                       list(RESULTS$StateEnd))