diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 3cd9a0e38dd4c847b0a486b855063df03888d9d0..cba9554c78c30a26d873b9b47f710c2e02130e65 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -2830,11 +2830,12 @@ DynamicModel::writeDynamicFile(const string& basename, bool use_dll, const strin
 
   writeSetAuxiliaryVariablesFile<true>(basename, julia);
 
-  writeComplementarityConditionsFile<true>(basename);
-
-  // Support for model debugging
   if (!julia)
-    writeDebugModelMFiles<true>(basename);
+    {
+      writeComplementarityConditionsFile<true>(basename);
+      // Support for model debugging
+      writeDebugModelMFiles<true>(basename);
+    }
 }
 
 void
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index 00b70fbd622eb3eac3879c6e96dc65489dd6878a..8a2212383a4eca9957d24783b0f9221cb9e56602 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -308,11 +308,12 @@ StaticModel::writeStaticFile(const string& basename, bool use_dll, const string&
 
   writeSetAuxiliaryVariablesFile<false>(basename, julia);
 
-  writeComplementarityConditionsFile<false>(basename);
-
-  // Support for model debugging
   if (!julia)
-    writeDebugModelMFiles<false>(basename);
+    {
+      writeComplementarityConditionsFile<false>(basename);
+      // Support for model debugging
+      writeDebugModelMFiles<false>(basename);
+    }
 }
 
 bool