diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
index 3f933bbdb98..5377e097a40 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java
@@ -182,6 +182,7 @@ public class ConfigurationModification extends FolderInfoModification implements
 			return;
 		
 		fRealBuilder = realBuilder;
+		fCompletePathMapStorage = null;
 		
 		PerTypeMapStorage storage = getCompleteObjectStore();
 		TcModificationUtil.applyBuilder(storage, getResourceInfo().getPath(), fSelectedBuilder);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java
index 2a7568dc988..5cb119befec 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListModification.java
@@ -59,7 +59,7 @@ public abstract class ToolListModification implements
 //	private LinkedHashMap fRealToToolMap = new LinkedHashMap();
 //	private boolean fSysInfoMapInited;
 	private PerTypeMapStorage fCompleteObjectStorage;
-	private TreeMap fCompletePathMapStorage;
+	protected TreeMap fCompletePathMapStorage;
 	private HashSet fAddCapableTools;
 	private Map fFilteredOutTools;
  
@@ -739,4 +739,5 @@ public abstract class ToolListModification implements
 		}
 		return fCompletePathMapStorage;
 	}
+	
 }