diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescription.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescription.java
index aa2824cee49..4a755874640 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescription.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescription.java
@@ -192,6 +192,7 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 			CConfigurationDescriptionCache cache = (CConfigurationDescriptionCache)iter.next();
 			try {
 				cache.loadData(factory);
+				factory.clear();
 			} catch (CoreException e) {
 				CCorePlugin.log(e);
 				iter.remove();
@@ -200,8 +201,6 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 		
 //		doneInitializing();
 		
-		factory.clear();
-		
 //		fIsLoadding = false;
 	}
 
@@ -216,6 +215,7 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 			try {
 				if(cache.applyData(factory, context))
 					modified = true;
+				factory.clear();
 			} catch (CoreException e) {
 				CCorePlugin.log(e);
 				e.printStackTrace();
@@ -225,8 +225,6 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 		
 //		doneInitializing();
 		
-		factory.clear();
-		
 //		fIsApplying = false;
 		
 		return modified;