diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 3b3fba2a24c53b400ed5652f3bf1b0f818cda7fb..8e6755312866d80df09d93357f0804035b78c943 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -641,7 +641,7 @@ end
 estim_params_= get_matrix_entries_for_psd_check(M_,estim_params_);
 
 if options_.load_results_after_load_mh
-    if ~exist([M_.fname '_results.mat'],'file')
+    if ~exist([M_.dname filesep 'Output' filesep M_.fname '_results.mat'],'file')
         fprintf('\ndynare_estimation_init:: You specified the load_results_after_load_mh, but no _results.mat-file\n')
         fprintf('dynare_estimation_init:: was found. Results will be recomputed.\n')
         options_.load_results_after_load_mh=0;
diff --git a/tests/estimation/fs2000.mod b/tests/estimation/fs2000.mod
index f12c8d9b036dadaae794473d609a54d881cb58ec..f584d3ce968322863e03f29cf1a88ae24de10bcc 100644
--- a/tests/estimation/fs2000.mod
+++ b/tests/estimation/fs2000.mod
@@ -119,7 +119,10 @@ if ~isoctave
     end
 end
         
-save('fs2000_result.mat','oo_')        
+if ~exist([M_.dname filesep 'Output'],'dir')
+    mkdir(M_.dname,'Output');
+end
+save([M_.dname filesep 'Output' filesep 'fs2000_results.mat'], 'oo_');
 options_.load_results_after_load_mh=1;
 estimation(mode_compute=0,mode_file='fs2000/Output/fs2000_mode',order=1, datafile=fsdat_simul, nobs=192, loglinear, mh_replic=0, mh_nblocks=1, mh_jscale=10,load_mh_file,smoother) gy_obs gp_obs;
 oo_.MarginalDensity.LaplaceApproximation = Laplace; %reset correct Laplace