diff --git a/matlab/dynare_estimation_1.m b/matlab/dynare_estimation_1.m
index cb8348493..a15a5af5c 100644
--- a/matlab/dynare_estimation_1.m
+++ b/matlab/dynare_estimation_1.m
@@ -516,10 +516,14 @@ if options_.mode_compute > 0 & options_.posterior_mode_estimation
     end
     if options_.mode_compute ~= 5
         if options_.mode_compute ~= 6
-            if ~options_.bvar_dsge
-                hh = reshape(hessian('DsgeLikelihood',xparam1,options_.gstep,gend,data,data_index,number_of_observations,no_more_missing_observations),nx,nx);
-            else
-                hh = reshape(hessian('DsgeVarLikelihood',xparam1,options_.gstep,gend),nx,nx);
+            if options_.cova_compute == 1
+                if ~options_.bvar_dsge
+                    hh = reshape(hessian('DsgeLikelihood',xparam1, ...
+                                         options_.gstep,gend,data,data_index,number_of_observations,...
+                                         no_more_missing_observations),nx,nx);
+                else
+                    hh = reshape(hessian('DsgeVarLikelihood',xparam1,options_.gstep,gend),nx,nx);
+                end
             end
         end
         save([M_.fname '_mode.mat'],'xparam1','hh','bayestopt_');
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index b65f89fff..35a471566 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -182,6 +182,7 @@ function global_initialization()
   options_.trace_plot_ma = 200;
   options_.mh_autocorrelation_function_size = 30;
   options_.plot_priors = 0;
+  options_.cova_compute = 1;
   
   % Misc
   options_.conf_sig = 0.6;