diff --git a/matlab/initial_condition_decomposition.m b/matlab/initial_condition_decomposition.m
index ff6c22433eecdc8fcc2ef28f4588df6029d9711f..af98862c6c3b2bebde7d4a3dfb98e50a750faecd 100644
--- a/matlab/initial_condition_decomposition.m
+++ b/matlab/initial_condition_decomposition.m
@@ -74,7 +74,7 @@ end
 if ~isfield(oo_,'initval_decomposition')
     options_.selected_variables_only = 0; %make sure all variables are stored
     options_.plot_priors=0;
-    [oo,junk1,junk2,Smoothed_Variables_deviation_from_mean] = evaluate_smoother(parameter_set,varlist,M_,oo_,options_,bayestopt_,estim_params_);
+    [oo,M,junk1,junk2,Smoothed_Variables_deviation_from_mean] = evaluate_smoother(parameter_set,varlist,M_,oo_,options_,bayestopt_,estim_params_);
 
     % reduced form
     dr = oo.dr;
@@ -125,6 +125,7 @@ oo=oo_;
 oo.shock_decomposition = oo_.initval_decomposition;
 M_.exo_names = M_.endo_names;
 M_.exo_nbr = M_.endo_nbr;
+options_.plot_shock_decomp.realtime=0;
 options_.plot_shock_decomp.screen_shocks=1;
 options_.plot_shock_decomp.use_shock_groups = '';
 options_.plot_shock_decomp.fig_names='initval';