diff --git a/ModFile.cc b/ModFile.cc
index 4be66ee4..939526b0 100644
--- a/ModFile.cc
+++ b/ModFile.cc
@@ -153,8 +153,7 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all) const
   if (clear_all)
     mOutputFile << "clear all" << endl;
   mOutputFile << "tic;" << endl;
-  mOutputFile << "global M_ oo_" << endl;
-  mOutputFile << "global options_ endval_" << endl;
+  mOutputFile << "global M_ oo_ options_" << endl;
   mOutputFile << "global ys0_ ex0_ ct_" << endl;
   mOutputFile << "options_ = [];" << endl;
   mOutputFile << "M_.fname = '" << basename << "';" << endl;
diff --git a/NumericalInitialization.cc b/NumericalInitialization.cc
index 061f2a80..cf5bf600 100644
--- a/NumericalInitialization.cc
+++ b/NumericalInitialization.cc
@@ -83,8 +83,7 @@ InitValStatement::writeOutput(ostream &output, const string &basename) const
          << "% INITVAL instructions" << endl
          << "%" << endl;
   // Writing initval block to set initial values for variables
-  output << "options_.initval_file = 0;" << endl
-         << "endval_=0;" << endl;
+  output << "options_.initval_file = 0;" << endl;
 
   writeInitValues(output);
 
@@ -113,8 +112,7 @@ EndValStatement::writeOutput(ostream &output, const string &basename) const
          << "%" << endl;
   // Writing endval block to set terminal values for variables
   output << "ys0_= oo_.steady_state;" << endl
-         << "ex0_ = oo_.exo_steady_state;" << endl
-         << "endval_ = 1;" << endl;
+         << "ex0_ = oo_.exo_steady_state;" << endl;
 
   writeInitValues(output);
 }