diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index 36a462e05ea041a79b45853e427ea8ce9c220687..04fe0c818e49977fbbef106844ece8e996d1c1e4 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -334,14 +334,13 @@ CreateRunOptions <- function(FUN_MOD, InputsModel,
   if (is.null(Outputs_Cal)) {
     if ("GR" %in% ObjectClass) {
       Outputs_Cal <- c("Qsim", "Param")
+      if ("CemaNeige" %in% ObjectClass) {
+        Outputs_Cal <- c("PliqAndMelt", Outputs_Cal)
+      }
     }
     if ("CemaNeige" %in% ObjectClass) {
       Outputs_Cal <- c("all")
     }
-    if ("GR" %in% ObjectClass &
-        "CemaNeige" %in% ObjectClass) {
-      Outputs_Cal <- c("PliqAndMelt", "Qsim")
-    }
   } else {
     if (!is.vector(Outputs_Cal)) {
       stop("'Outputs_Cal' must be a vector of characters")