diff --git a/DESCRIPTION b/DESCRIPTION
index 783d5584b235df383cc808e6308a707c555f94a1..3626ab0d654d9022f1554ac701def2372f1abde5 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.15.4
-Date: 2018-10-15
+Version: 1.0.15.5
+Date: 2018-10-16
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
   person("Charles", "Perrin", role = c("aut", "ths"), comment = c(ORCID = "0000-0001-8552-1881")),
diff --git a/NEWS.rmd b/NEWS.rmd
index e9bc89c5240be85e17940acb10520fc4e2aa2ff8..ddd0037192f84b257b98bf37d84c7676505ded41 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
 
 
 
-### 1.0.15.4 Release Notes (2018-10-15) 
+### 1.0.15.5 Release Notes (2018-10-16) 
 
 
 
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index dd15c658427b0cae362c00a2c71c4f285bc54e0d..33dd24c76940a9d23d63cdd708255cbd2a6cfd8c 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -42,7 +42,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
       if (any(VarObs %in% 0)) {
         warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
       }
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 37095d8ed6bb5f9adf7c9b850570fa04e6c099a7..66f0f889a5e34d4b01a6756dbe6a5babeeb8021b 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -42,7 +42,7 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
       if (any(VarObs %in% 0)) {
         warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
       }
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index 598778ce6e0497c9fe98c288fc14ffa1ffd8b397..d3adc5a39c9876c5fd52ef721634bcf588b5b757 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -42,7 +42,7 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
       if (any(VarObs %in% 0)) {
         warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
       }
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index b21a8af6672359e1cfa2c05e12b1d40f605d0c9c..e15d48ae83a758067051acd91213f313f73da759 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -42,7 +42,7 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & verbose) {
+    if (InputsCrit$transfo %in% c("log", "inv") & is.null(InputsCrit$epsilon) & warnings) {
       if (any(VarObs %in% 0)) {
         warning("zeroes detected in Qobs: the corresponding time-steps will be excluded from the criteria computation if the epsilon argument of 'CreateInputsCrit' = NULL")
       }