diff --git a/matlab/dyn_ramsey_static.m b/matlab/dyn_ramsey_static.m
index efffeb60b53990ad6372703a2f594f92b1b1b19a..42a553c342107b81555fdd3f27209e4bc71d2474 100644
--- a/matlab/dyn_ramsey_static.m
+++ b/matlab/dyn_ramsey_static.m
@@ -63,9 +63,10 @@ elseif options_.steadystate_flag
     else
         %solve for instrument, using multivariate solver, starting at
         %initial value for instrument
-        opt = options_;
-        opt.jacobian_flag = false;
-        [inst_val, errorflag] = dynare_solve(nl_func, ys_init(k_inst), options_.ramsey.maxit, options_.solve_tolf, options_.solve_tolx, opt);
+        o_jacobian_flag = options_.jacobian_flag;
+        options_.jacobian_flag = false;
+        [inst_val, errorflag] = dynare_solve(nl_func, ys_init(k_inst), options_.ramsey.maxit, options_.solve_tolf, options_.solve_tolx, options_);
+        options_.jacobian_flag = o_jacobian_flag;
         if errorflag
             check=81;
         end
@@ -77,9 +78,10 @@ elseif options_.steadystate_flag
 else
     n_var = M.orig_endo_nbr;
     xx = oo.steady_state(1:n_var);
-    opt = options_;
-    opt.jacobian_flag = false;
-    [xx, errorflag] = dynare_solve(nl_func, xx, options_.ramsey.maxit, options_.solve_tolf, options_.solve_tolx, opt);
+    o_jacobian_flag = options_.jacobian_flag;
+    options_.jacobian_flag = false;
+    [xx, errorflag] = dynare_solve(nl_func, xx, options_.ramsey.maxit, options_.solve_tolf, options_.solve_tolx, options_);
+    options_.jacobian_flag = o_jacobian_flag;
     if errorflag
         check=81;
     end
diff --git a/matlab/partial_information/dr1_PI.m b/matlab/partial_information/dr1_PI.m
index 0b12df983b34680d847451db53842ab82b05824f..e7457cc327d75cfc5c76ed362ff81054ca166faa 100644
--- a/matlab/partial_information/dr1_PI.m
+++ b/matlab/partial_information/dr1_PI.m
@@ -85,14 +85,12 @@ if options_.ramsey_policy && ~options_.ACES_solver
         M_.maximum_lag = orig_model.maximum_lag;
         M_.maximum_endo_lag = orig_model.maximum_endo_lag;
     end
-    old_solve_algo = options_.solve_algo;
-    %  options_.solve_algo = 1;
-    opt = options_;
-    opt.jacobian_flag = false;
+    o_jacobian_flag = options_.jacobian_flag;
+    options_.jacobian_flag = false;
     oo_.steady_state = dynare_solve('ramsey_static', oo_.steady_state, ...
                                     options_.ramsey.maxit, options_.solve_tolf, options_.solve_tolx, ...
-                                    opt, M_, options_, oo_, it_);
-    options_.solve_algo = old_solve_algo;
+                                    options_, M_, options_, oo_, it_);
+    options_.jacobian_flag = o_jacobian_flag;
     [~,~,multbar] = ramsey_static(oo_.steady_state,M_,options_,oo_,it_);
     [jacobia_,M_] = ramsey_dynamic(oo_.steady_state,multbar,M_,options_,oo_,it_);
     klen = M_.maximum_lag + M_.maximum_lead + 1;