diff --git a/DESCRIPTION b/DESCRIPTION
index b8854187910eaad0d0150494435663e9aaad3efe..18dd4327555d8953c15bbef796e01106d41127d6 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.3.2.35
+Version: 1.3.2.36
 Date: 2019-09-19
 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 db3bdbd570436f0b834d79d85639538db2fd83ea..efba79452da305a9a44f681022c28eb015a521ac 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 
 
-### 1.3.2.35 Release Notes (2019-09-19)
+### 1.3.2.36 Release Notes (2019-09-19)
 
 
 #### Version control and issue tracking
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index e9830b0acfa7896f46d70264a39a3063a45a3bab..996f178d57edaf1a1a007ef99933bdcdcd056301 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -203,13 +203,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel, IsHyst = FALSE,
   if (is.null(GthrCemaNeigeLayers)) {
     GthrCemaNeigeLayers <- rep(Inf, NLayers)
   }
-  if (is.infinite(GthrCemaNeigeLayers)) {
+  if (any(is.infinite(GthrCemaNeigeLayers))) {
     GthrCemaNeigeLayers <- rep(Inf, NLayers)
   }
   if (is.null(GlocmaxCemaNeigeLayers)) {
     GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
   }
-  if (is.infinite(GlocmaxCemaNeigeLayers)) {
+  if (any(is.infinite(GlocmaxCemaNeigeLayers))) {
     GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
   }