diff --git a/matlab/ms-sbvar/initialize_ms_sbvar_options.m b/matlab/ms-sbvar/initialize_ms_sbvar_options.m
index 43ea36569d0d4c3992c33373e10c2873825deff1..369cbfead92a1e9deebd729341736cd3d88c11ad 100644
--- a/matlab/ms-sbvar/initialize_ms_sbvar_options.m
+++ b/matlab/ms-sbvar/initialize_ms_sbvar_options.m
@@ -32,15 +32,11 @@ function options_=initialize_ms_sbvar_options(M_, options_)
 % MS SBVAR
 % all mex functions
 options_.ms.file_tag = M_.fname;
-options_.ms.create_init = 1;
 options_.ms.mh_file = '';
 options_.ms.free_param_file = '';
-if isfield(options_.ms,'simulation_file_tag')
-    options_.ms = rmfield(options_.ms,'simulation_file_tag');
-end
-if isfield(options_.ms,'output_file_tag')
-    options_.ms = rmfield(options_.ms,'output_file_tag');
-end
+options_.ms.output_file_tag = '';
+options_.ms.simulation_file_tag = '';
+options_.ms.create_init = 1;
 % prepare ms sbvar & estimation
 options_.ms.coefficients_prior_hyperparameters = [1.0 1.0 0.1 1.2 1.0 1.0];
 options_.ms.freq = 4;
diff --git a/matlab/ms-sbvar/set_file_tags.m b/matlab/ms-sbvar/set_file_tags.m
index cacd91e6945f9a54a00933883e2b90221e0d995a..6945f4ca22ff45a93eebf2b13f759df90b1b4936 100644
--- a/matlab/ms-sbvar/set_file_tags.m
+++ b/matlab/ms-sbvar/set_file_tags.m
@@ -11,7 +11,7 @@ function [options_]=set_file_tags(options_)
 % SPECIAL REQUIREMENTS
 %    none
 
-% Copyright (C) 2011 Dynare Team
+% Copyright (C) 2011-2012 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -28,7 +28,7 @@ function [options_]=set_file_tags(options_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if ~isfield(options_.ms,'output_file_tag')
+if isempty(options_.ms.output_file_tag)
     options_.ms.output_file_tag = options_.ms.file_tag;
 end
 end
diff --git a/matlab/ms-sbvar/set_ms_simulation_file.m b/matlab/ms-sbvar/set_ms_simulation_file.m
index 75e815b470898fd027420dda65edf0c90c8321fc..b65427c42ec2c39b6c9c4f613f6817fd77ee9241 100644
--- a/matlab/ms-sbvar/set_ms_simulation_file.m
+++ b/matlab/ms-sbvar/set_ms_simulation_file.m
@@ -11,7 +11,7 @@ function options_=set_ms_simulation_file(options_)
 % SPECIAL REQUIREMENTS
 %    none
 
-% Copyright (C) 2011 Dynare Team
+% Copyright (C) 2011-2012 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -28,7 +28,7 @@ function options_=set_ms_simulation_file(options_)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if ~isfield(options_.ms, 'simulation_file_tag')
+if isempty(options_.ms.simulation_file_tag)
     options_.ms.simulation_file_tag = options_.ms.file_tag;
 end
 options_.ms.mh_file = ['simulation_' options_.ms.simulation_file_tag '.out'];