diff --git a/matlab/ep/extended_path.m b/matlab/ep/extended_path.m
index d0e4f2ba4956c213df7901239b37223a40071210..ee26039bc567c2660597d9844d43fb3e00bf76c9 100644
--- a/matlab/ep/extended_path.m
+++ b/matlab/ep/extended_path.m
@@ -49,7 +49,8 @@ endo_nbr = DynareModel.endo_nbr;
 exo_nbr = DynareModel.exo_nbr;
 maximum_lag = DynareModel.maximum_lag;
 maximum_lead = DynareModel.maximum_lead;
-epreplic_nbr = ep.replic_nbr;
+replic_nbr = ep.replic_nbr;
+
 steady_state = DynareResults.steady_state;
 dynatol = DynareOptions.dynatol;
 
@@ -215,18 +216,18 @@ while (t <= sample_size)
             exo_simul(2,:) = shocks((t-2)*replic_nbr+k,:);
             [results{k}(:,t), info_convergence] = extended_path_core(ep.periods, endo_nbr, exo_nbr, positive_var_indx, ...
                                                               exo_simul, ep.init, results{k}(:,t-1),...
-                                                              maximum_lag, maximum_lead, steady_state, ...
+                                                              steady_state, ...
                                                               ep.verbosity, bytecode_flag, ep.stochastic.order, ...
                                                               DynareModel.params, pfm,ep.stochastic.algo, ep.solve_algo, ep.stack_solve_algo, ...
                                                               DynareOptions.lmmcp, DynareOptions, DynareResults);
         end
     else
         for k = 1:replic_nbr
-            exo_simul = repmat(DynareResults.exo_steady_state',periods+maximum_lag+ maximum_lead,1);
-            exo_simul(maximum_lag+1,:) = shocks((t-2)*replic_nbr+k,:);
+            exo_simul = repmat(DynareResults.exo_steady_state',periods+2, 1);
+            exo_simul(2,:) = shocks((t-2)*replic_nbr+k,:);
             [results{k}(:,t), info_convergence] = extended_path_core(ep.periods, endo_nbr, exo_nbr, positive_var_indx, ...
                                                               exo_simul, ep.init, results{k}(:,t-1),...
-                                                              maximum_lag, maximum_lead, steady_state, ...
+                                                              steady_state, ...
                                                               ep.verbosity, bytecode_flag, ep.stochastic.order,...
                                                               DynareModel, pfm,ep.stochastic.algo, ep.solve_algo, ep.stack_solve_algo,...
                                                               DynareOptions.lmmcp, DynareOptions, DynareResults);
diff --git a/matlab/ep/extended_path_core.m b/matlab/ep/extended_path_core.m
index 73c9b416e3d7d2ea2165ef3cd245025fe3e5ba25..dacaeb9932cbe45619150439e98c2801600ae8e2 100644
--- a/matlab/ep/extended_path_core.m
+++ b/matlab/ep/extended_path_core.m
@@ -1,6 +1,6 @@
 function [y, info_convergence] = extended_path_core(periods,endo_nbr,exo_nbr,positive_var_indx, ...
                                 exo_simul,init,initial_conditions,...
-                                maximum_lag,maximum_lead,steady_state, ...
+                                steady_state, ...
                                 verbosity,bytecode_flag,order,M,pfm,algo,solve_algo,stack_solve_algo,...
                                 olmmcp,options,oo)