diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index e403df3a378e9dbb4be3abc59fbb41684995cae7..4e891c38a3985de657c81bba40fb56ee1ac59a93 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -319,6 +319,10 @@ if options_.analytic_derivation,
     end
 end
 
+% If jscale isn't specified for an estimated parameter, use global option options_.jscale, set to 0.2, by default.
+k = find(isnan(bayestopt_.jscale));
+bayestopt_.jscale(k) = options_.mh_jscale;
+
 % Test if the dataset is declared.
 if isempty(options_.datafile) && isempty(options_.dataset) 
     if gsa_flag
@@ -329,10 +333,6 @@ if isempty(options_.datafile) && isempty(options_.dataset)
     end
 end
 
-% If jscale isn't specified for an estimated parameter, use global option options_.jscale, set to 0.2, by default.
-k = find(isnan(bayestopt_.jscale));
-bayestopt_.jscale(k) = options_.mh_jscale;
-
 % Take data in logs?
 logged_data_flag = 0;
 if options_.loglinear && ~options_.logdata