diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 4057c336c733cf8131b9b040420e8acc623a8b87..af476b32dbe07f283df58d00ba15fc1d42cc855a 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -319,12 +319,10 @@ if options_.analytic_derivation,
     end
 end
 
-% Test if the data file is declared.
-if isempty(options_.datafile)
+% Test if the dataset is declared.
+if isempty(options_.datafile) && isempty(options_.dataset) 
     if gsa_flag
         dataset_ = [];
-%         rawdata = [];
-%         data_info = [];
         return
     else
         error('datafile option is missing')
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index 50cf7dd86eff464bd9172a191ffaac1699290001..a10ea6e702745d67df434e17216c8e19f19a1f44 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -33,6 +33,7 @@ global oo_ M_ options_ estim_params_ bayestopt_ estimation_info ex0_ ys0_  ex_de
 estim_params_ = [];
 bayestopt_ = [];
 options_.datafile = '';
+options_.dataset = [];
 options_.verbosity = 1;
 options_.terminal_condition = 0;
 options_.rplottype = 0;
@@ -329,11 +330,11 @@ estimation_info.structural_innovation_corr_prior_index = {};
 estimation_info.structural_innovation_corr_options_index = {};
 estimation_info.structural_innovation_corr.range_index = {};
 options_.initial_period = dynDate(1);
-options_.dataset.firstobs = options_.initial_period;
-options_.dataset.lastobs = NaN;
-options_.dataset.nobs = NaN;
-options_.dataset.xls_sheet = NaN;
-options_.dataset.xls_range = NaN;
+options_.old_dataset.firstobs = options_.initial_period;
+options_.old_dataset.lastobs = NaN;
+options_.old_dataset.nobs = NaN;
+options_.old_dataset.xls_sheet = NaN;
+options_.old_dataset.xls_range = NaN;
 options_.Harvey_scale_factor = 10;
 options_.MaxNumberOfBytes = 1e6;
 options_.MaximumNumberOfMegaBytes = 111;