diff --git a/DESCRIPTION b/DESCRIPTION
index 903d219f4f27900a2cb77b9a689fcdee07319baa..4a96bb05c2068f41688339dc2e0c1387e3d647bd 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.0.13.6
+Version: 1.0.13.7
 Date: 2018-08-29
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 1d3acea659cf1e6775864fe0e1afa22f0961aec4..617d0fe49ad493147f5801d29e98aab61cbe51cc 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
 
 
 
-### 1.0.13.6 Release Notes (2018-08-29) 
+### 1.0.13.7 Release Notes (2018-08-29) 
 
 
 #### Deprectated and defunct
diff --git a/R/ErrorCrit_KGE.R b/R/ErrorCrit_KGE.R
index fa82de1746ef0912ba18b6fd99acd06c28e25832..048b529c5a3c7cfe3c5178f29f354cc50f010e88 100644
--- a/R/ErrorCrit_KGE.R
+++ b/R/ErrorCrit_KGE.R
@@ -42,11 +42,9 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
-      if (length(InputsCrit$Ind_zeroes) > 0) {
-        VarObs <- VarObs + InputsCrit$epsilon
-        VarSim <- VarSim + InputsCrit$epsilon
-      }
+    if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+      VarObs <- VarObs + InputsCrit$epsilon
+      VarSim <- VarSim + InputsCrit$epsilon
     }
     if (InputsCrit$transfo == "sqrt") {
       VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_KGE2.R b/R/ErrorCrit_KGE2.R
index 88b1d6b80c1ba3507ddcdd4ca8c1c9e72c0160a7..ebc4a942291ba43368759fccc6f9d2156f7ccc71 100644
--- a/R/ErrorCrit_KGE2.R
+++ b/R/ErrorCrit_KGE2.R
@@ -42,11 +42,9 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
-      if (length(InputsCrit$Ind_zeroes) > 0) {
-        VarObs <- VarObs + InputsCrit$epsilon
-        VarSim <- VarSim + InputsCrit$epsilon
-      }
+    if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+      VarObs <- VarObs + InputsCrit$epsilon
+      VarSim <- VarSim + InputsCrit$epsilon
     }
     if (InputsCrit$transfo == "sqrt") {
       VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_NSE.R b/R/ErrorCrit_NSE.R
index b65f72242dad972f79e5bc25dd074966461a4403..9fe2658b5bc3957409695083fc7ef26578937947 100644
--- a/R/ErrorCrit_NSE.R
+++ b/R/ErrorCrit_NSE.R
@@ -42,11 +42,9 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
-      if (length(InputsCrit$Ind_zeroes) > 0) {
-        VarObs <- VarObs + InputsCrit$epsilon
-        VarSim <- VarSim + InputsCrit$epsilon
-      }
+    if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+      VarObs <- VarObs + InputsCrit$epsilon
+      VarSim <- VarSim + InputsCrit$epsilon
     }
     if (InputsCrit$transfo == "sqrt") {
       VarObs <- sqrt(VarObs)
diff --git a/R/ErrorCrit_RMSE.R b/R/ErrorCrit_RMSE.R
index 085871ccd130fa2648a591dfe0b8d6213e5c0e33..aed56617026bd19cd7c2738e62c469b2aa4313c8 100644
--- a/R/ErrorCrit_RMSE.R
+++ b/R/ErrorCrit_RMSE.R
@@ -42,11 +42,9 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
     VarSim[!InputsCrit$BoolCrit] <- NA
     
     ##Data_transformation
-    if ("Ind_zeroes" %in% names(InputsCrit) & "epsilon" %in% names(InputsCrit)) {
-      if (length(InputsCrit$Ind_zeroes) > 0) {
-        VarObs <- VarObs + InputsCrit$epsilon
-        VarSim <- VarSim + InputsCrit$epsilon
-      }
+    if ("epsilon" %in% names(InputsCrit) & !is.null(InputsCrit$epsilon)) {
+      VarObs <- VarObs + InputsCrit$epsilon
+      VarSim <- VarSim + InputsCrit$epsilon
     }
     if (InputsCrit$transfo == "sqrt") {
       VarObs <- sqrt(VarObs)