diff --git a/matlab/disp_dr.m b/matlab/disp_dr.m
index 98e8865cbb2ee515acf1c9110d49bbe0185c55af..d11699222089f5c543c577f561588d87e9aceb30 100644
--- a/matlab/disp_dr.m
+++ b/matlab/disp_dr.m
@@ -29,7 +29,7 @@ function disp_dr(dr,order,var_list)
 
 global M_ options_
 
-if M_.hessian_eq_zero && order~=1
+if order~=1 && M_.hessian_eq_zero
     order = 1;
     warning('disp_dr: using order = 1 because Hessian is equal to zero');
 end
@@ -299,4 +299,4 @@ if abs(x) >= options_.dr_display_tol
 else
     str = [str sprintf(value_format_zero, 0)];
 end
-end
\ No newline at end of file
+end
diff --git a/matlab/irf.m b/matlab/irf.m
index d1c7014e87c25e46aa75dbad6279759a2f009269..33f9e9fb1ca2e9a5df381a6e0d8c3459f0f1a8c0 100644
--- a/matlab/irf.m
+++ b/matlab/irf.m
@@ -43,7 +43,7 @@ end
 y       = 0;
 
 local_order = iorder;
-if M_.hessian_eq_zero && local_order~=1
+if local_order~=1 && M_.hessian_eq_zero
     local_order = 1;
 end
 
diff --git a/matlab/stoch_simul.m b/matlab/stoch_simul.m
index 43e5c068ca3b860d3ddf49acd249cb782594a2b5..9d6d798b52592aef9a2c82697eaa99e755f67442 100644
--- a/matlab/stoch_simul.m
+++ b/matlab/stoch_simul.m
@@ -38,7 +38,7 @@ if options_.order == 1
     options_.replic = 1;
 end
 
-if M_.hessian_eq_zero && options_.order~=1
+if options_.order~=1 && M_.hessian_eq_zero
     options_.order = 1;
     warning('stoch_simul: using order = 1 because Hessian is equal to zero');
 end
diff --git a/matlab/stochastic_solvers.m b/matlab/stochastic_solvers.m
index 6dfcb8120f6292aba5fcc318eab36b113ab32052..5aa9920b410c7032925704597380eabbeff6a2bb 100644
--- a/matlab/stochastic_solvers.m
+++ b/matlab/stochastic_solvers.m
@@ -24,7 +24,7 @@ function [dr, info] = stochastic_solvers(dr, task, M_, options_, oo_)
 %                                 info=6 -> The jacobian matrix evaluated at the steady state is complex.
 %                                 info=9 -> k_order_pert was unable to compute the solution
 
-% Copyright (C) 1996-2018 Dynare Team
+% Copyright (C) 1996-2019 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -48,7 +48,7 @@ if options_.linear
 end
 
 local_order = options_.order;
-if M_.hessian_eq_zero && local_order~=1
+if local_order~=1 && M_.hessian_eq_zero
     local_order = 1;
     warning('stochastic_solvers: using order = 1 because Hessian is equal to zero');
 end
diff --git a/matlab/th_autocovariances.m b/matlab/th_autocovariances.m
index 4b82390437feb0b5fda63a27af0f7d76dacb022d..a095d64300963fd8c86b273820bd7783298402d2 100644
--- a/matlab/th_autocovariances.m
+++ b/matlab/th_autocovariances.m
@@ -42,7 +42,7 @@ function [Gamma_y,stationary_vars] = th_autocovariances(dr,ivar,M_,options_,node
 %   E(x_t) = (I - {g_x}\right)^{- 1} 0.5\left( g_{\sigma\sigma} \sigma^2 + g_{xx} Var(\hat x_t) + g_{uu} Var(u_t) \right)
 %   \]
 %
-% Copyright (C) 2001-2017 Dynare Team
+% Copyright (C) 2001-2019 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -68,7 +68,7 @@ if options_.order >= 3
 end
 
 local_order = options_.order;
-if M_.hessian_eq_zero && local_order~=1
+if local_order~=1 && M_.hessian_eq_zero
     local_order = 1;
 end
 
diff --git a/preprocessor b/preprocessor
index c1b8cdf811b94ed725111a8b013ec5fd24849aac..141cff07613dd5440a746103eb195ad05424ad01 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit c1b8cdf811b94ed725111a8b013ec5fd24849aac
+Subproject commit 141cff07613dd5440a746103eb195ad05424ad01