diff --git a/JavaSource/org/unitime/timetable/solver/TimetableSolver.java b/JavaSource/org/unitime/timetable/solver/TimetableSolver.java
index fe41b1a3bd..f655be9ebf 100644
--- a/JavaSource/org/unitime/timetable/solver/TimetableSolver.java
+++ b/JavaSource/org/unitime/timetable/solver/TimetableSolver.java
@@ -153,10 +153,18 @@ protected TimetableModel createModel(DataProperties properties) {
 
 	@Override
 	protected Document createCurrentSolutionBackup(boolean anonymize, boolean idconv) {
-		
         if (anonymize) {
             getProperties().setProperty("Xml.ConvertIds", idconv ? "true" : "false");
             getProperties().setProperty("Xml.ShowNames", "false");
+            getProperties().setProperty("Xml.SaveInitial", "false");
+            getProperties().setProperty("Xml.SaveBest", "false");
+            getProperties().setProperty("Xml.SaveSolution", "true");
+        } else {
+            getProperties().setProperty("Xml.ShowNames", "true");
+            getProperties().setProperty("Xml.ConvertIds", "false");
+            getProperties().setProperty("Xml.SaveInitial", "true");
+            getProperties().setProperty("Xml.SaveBest", "true");
+            getProperties().setProperty("Xml.SaveSolution", "true");
         }
 
         TimetableXMLSaver saver = new TimetableXMLSaver(this);
@@ -182,11 +190,6 @@ protected Document createCurrentSolutionBackup(boolean anonymize, boolean idconv
 				cbsInfo.save(document.getRootElement().addElement("cbsInfo"));
 		}
 
-		if (anonymize) {
-			getProperties().setProperty("Xml.ConvertIds", "false");
-			getProperties().setProperty("Xml.ShowNames", "true");
-		}
-
 		return document;
 	}