diff --git a/DESCRIPTION b/DESCRIPTION
index 89b09984ff9052842a0ba841f3f761c40b71c0de..e7e083d402ba9a0ea818d772009010203963f7bb 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.9.19
+Version: 1.0.9.20
 Date: 2017-08-11
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index 756b095b74c121cfc32adb25c4dd00facd5b3f7e..af764d46a2ab0a1aeaa8a336229517108cc45104 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -69,7 +69,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
     }
   } else if (!is.null(ExpStore)) {
     if (verbose) {
-      warning("This 'FUN_MOD' does not require 'ExpStore'. Value set to NA")
+      warning(sprintf("'%s' does not require 'ExpStore'. Value set to NA", as.character(substitute(FUN_MOD))))
     }
     ExpStore <- Inf
   }
@@ -77,13 +77,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
   if (identical(FUN_MOD, RunModel_GR2M)) {
     if (!is.null(UH1)) {
       if (verbose) {
-        warning("This 'FUN_MOD' does not require 'UH1'. Values set to NA")
+        warning(sprintf("'%s' does not require 'UH1'. Values set to NA", as.character(substitute(FUN_MOD))))
       }
       UH1 <- rep(Inf, UH1n)
     }
     if (!is.null(UH2)) {
       if (verbose) {
-        warning("This 'FUN_MOD' does not require 'UH2'. Values set to NA")
+        warning(sprintf("'%s' does not require 'UH2'. Values set to NA", as.character(substitute(FUN_MOD))))
       }
       UH2 <- rep(Inf, UH2n)
     }
@@ -92,7 +92,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
   
   if ((identical(FUN_MOD, RunModel_GR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J)) & !is.null(UH1)) {
     if (verbose) {
-      warning("This 'FUN_MOD' does not require 'UH1'. Values set to NA")
+      warning(sprintf("'%s' does not require 'UH1'. Values set to NA", as.character(substitute(FUN_MOD))))
     }
     UH1 <- rep(Inf, UH1n)
   }
@@ -105,7 +105,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
   if(!"CemaNeige" %in% ObjectClass &
      (!is.null(GCemaNeigeLayers) | !is.null(eTGCemaNeigeLayers))) {
     if (verbose) {
-      warning("This 'FUN_MOD' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA")
+      warning(sprintf("'%s' does not require 'GCemaNeigeLayers' and 'GCemaNeigeLayers'. Values set to NA", as.character(substitute(FUN_MOD))))
     }
     GCemaNeigeLayers   <- Inf
     eTGCemaNeigeLayers <- Inf