diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc
index 3c4933e40..73236f142 100644
--- a/preprocessor/ModFile.cc
+++ b/preprocessor/ModFile.cc
@@ -619,7 +619,8 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool no_log, b
     {
       (*it)->writeOutput(mOutputFile, basename);
 
-      // Special treatment for initval block: insert initial values for the auxiliary variables
+      /* Special treatment for initval block: insert initial values for the
+         auxiliary variables and initialize exo det */
       InitValStatement *ivs = dynamic_cast<InitValStatement *>(*it);
       if (ivs != NULL)
         {
@@ -627,6 +628,11 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool no_log, b
           ivs->writeOutputPostInit(mOutputFile);
         }
 
+      // Special treatment for endval block: insert initial values for the auxiliary variables
+      EndValStatement *evs = dynamic_cast<EndValStatement *>(*it);
+      if (evs != NULL)
+        static_model.writeAuxVarInitval(mOutputFile, oMatlabOutsideModel);
+
       // Special treatment for load params and steady state statement: insert initial values for the auxiliary variables
       LoadParamsAndSteadyStateStatement *lpass = dynamic_cast<LoadParamsAndSteadyStateStatement *>(*it);
       if (lpass && !no_static)