diff --git a/R/CreateCalibOptions.R b/R/CreateCalibOptions.R
index a33384b267a2fcc4fb3a00ed94ad9fe5ecd71fa5..10be5da0b4932be507200c2ee43743d5c3812f60 100644
--- a/R/CreateCalibOptions.R
+++ b/R/CreateCalibOptions.R
@@ -3,7 +3,7 @@ CreateCalibOptions <- function(FUN_MOD,
                                FUN_TRANSFO = NULL,
                                IsHyst = FALSE,
                                IsSD = FALSE,
-                               FUN_SD = NULL,
+                               FUN_SD = RunModel_Lag,
                                FixedParam = NULL,
                                SearchRanges = NULL,
                                StartParamList = NULL,
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index 9a8b4e9082ce32dbccdb775761f141b2ba05a199..8fb3262b27b02f82c0bbe9f11ecb8b01314b341f 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -2,8 +2,8 @@ CreateRunOptions <- function(FUN_MOD, InputsModel,
                              IndPeriod_WarmUp = NULL, IndPeriod_Run,
                              IniStates = NULL, IniResLevels = NULL, Imax = NULL,
                              Outputs_Cal = NULL, Outputs_Sim = "all",
-                             MeanAnSolidPrecip = NULL, FUN_SD = NULL, IsHyst = FALSE,
-                             warnings = TRUE, verbose = TRUE) {
+                             MeanAnSolidPrecip = NULL, FUN_SD = RunModel_Lag,
+                             IsHyst = FALSE, warnings = TRUE, verbose = TRUE) {
 
   if (!is.null(Imax)) {
     if (!is.numeric(Imax) | length(Imax) != 1L) {
@@ -20,6 +20,9 @@ CreateRunOptions <- function(FUN_MOD, InputsModel,
 
   ## check FUN_MOD
   FUN_MOD <- match.fun(FUN_MOD)
+  if (!inherits(InputsModel, "SD")) {
+    FUN_SD <- NULL
+  }
   FeatFUN_MOD <- .GetFeatModel(FUN_MOD = FUN_MOD, DatesR = InputsModel$DatesR,
                                FUN_SD = FUN_SD)
   ObjectClass <- FeatFUN_MOD$Class