diff --git a/matlab/evaluate_smoother.m b/matlab/evaluate_smoother.m
index 0e792190d798843cfcde0f23505175204cecc909..3b345a5090bc419a81208842624f792538080994 100644
--- a/matlab/evaluate_smoother.m
+++ b/matlab/evaluate_smoother.m
@@ -62,6 +62,8 @@ if ischar(parameters)
         parameters = bayestopt_.p5(:);
       case 'prior_mean'
         parameters = bayestopt_.p1;
+      case 'calibration'
+        parameters = [];
       otherwise
         disp('evaluate_smoother:: If the input argument is a string, then it has to be equal to:')
         disp('                     ''posterior_mode'', ')
@@ -69,6 +71,7 @@ if ischar(parameters)
         disp('                     ''posterior_median'', ')
         disp('                     ''prior_mode'' or')
         disp('                     ''prior_mean''.')
+        disp('                     ''calibration''.')
         error
     end
 end
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index d841ece1ae74658bf1e85c36a8a1c96cc494e1ee..39878f99ecd0182ed549483f836e6ed8a634f026 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -2034,6 +2034,7 @@ shock_decomposition_options_list : shock_decomposition_option COMMA shock_decomp
 shock_decomposition_option : o_parameter_set
                            | o_shocks
                            | o_labels
+                           | o_datafile
                            ;
 
 homotopy_setup: HOMOTOPY_SETUP ';' homotopy_list END ';'