diff --git a/DESCRIPTION b/DESCRIPTION
index 4fbef5640c6d002390e3c829dbde82325d0c62b0..bcaec6345cd947a5a87dcb83031982626fdfb682 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.12.5
+Version: 1.0.12.6
 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 eec23539edf7930ecb6dbef096f62601e535b2dc..bf7e6f7441ad535385bf9354ea936a13b7710214 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
 
 
 
-### 5 Release Notes (2018-08-29) 
+### 1.0.12.6 Release Notes (2018-08-29) 
 
 
 #### Deprectated and defunct
@@ -28,7 +28,7 @@ output:
 
 - <code>Calibration_Michel()</code> is now faster during the grid-screening step when a parameter is set using <code>FixedParam</code> in <code>CreateCalibOptions()</code>.
 
-- <code>CreateCalibOptions()</code> now returns an error when all the parameters ar set in <code>FixedParam</code>.
+- <code>CreateCalibOptions()</code> now returns an error when all the parameters are set and a warning message when all the parameters are not set <code>FixedParam</code> in the <code>FixedParam</code> argument.
 
 
 #### Minor user-visible changes
diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index 149e5ba4cb57af44d6a3c63e30a0e9b85a969e7f..1035b2344c3da1e36701157ac98101adc6422b8d 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -178,10 +178,13 @@ CreateCalibOptions <-
         stop("Incompatibility between FixedParam length and FUN_MOD \n")
         return(NULL)
       }
-      if (!all(is.na(FixedParam))) {
+      if (all(!is.na(FixedParam))) {
         stop("At least one parameter must be not set (NA) \n")
         return(NULL)
       }
+      if (all(is.na(FixedParam))) {
+        warning("You have not set any parameter in \"FixedParam\" \n")
+      }
     }
     
     ##check_SearchRanges