diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 12b1cc60c..874f96422 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -448,7 +448,7 @@ k = find(isnan(bayestopt_.jscale));
 bayestopt_.jscale(k) = options_.mh_jscale;
 
 % Build the dataset
-[dataset_, dataset_info] = makedataset(options_);
+[dataset_, dataset_info] = makedataset(options_, options_.dsge_var*options_.dsge_varlag, gsa_flag);
 
 % setting steadystate_check_flag option
 if options_.diffuse_filter
diff --git a/matlab/utilities/dataset/makedataset.m b/matlab/utilities/dataset/makedataset.m
index 6af59b065..9eb4cb396 100644
--- a/matlab/utilities/dataset/makedataset.m
+++ b/matlab/utilities/dataset/makedataset.m
@@ -1,4 +1,4 @@
-function [DynareDataset, DatasetInfo] = makedataset(DynareOptions,initialconditions)
+function [DynareDataset, DatasetInfo] = makedataset(DynareOptions, initialconditions, gsa_flag)
 
 % Initialize a dataset as a dseries object.
 %
@@ -23,7 +23,11 @@ function [DynareDataset, DatasetInfo] = makedataset(DynareOptions,initialconditi
 %
 % See also dynare_estimation_init
 
-if nargin<2
+if nargin<3
+    gsa_flag = 0;
+end
+
+if nargin<2 || isempty(initialconditions)
     % If a the sample is to be used for the estimation of a VAR or DSGE-VAR model
     % the second argument must be a strictly positive integer (the number of lags).
     initialconditions = 0;
@@ -32,6 +36,7 @@ end
 if isempty(DynareOptions.datafile) && isempty(DynareOptions.dataset.file) && isempty(DynareOptions.dataset.series)
     if gsa_flag
         DynareDataset = dseries();
+        DatasetInfo = [];
         return
     else
         error('makedataset: datafile option is missing!')