diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
index 020e4986f92..a5366deef6f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
@@ -586,7 +586,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
 			options = fLangData.getOptionsForKind(kind);
 			for(int i = 0; i < options.length; i++){
 				if(options[i] != newOption)
-					ManagedBuildManager.setOption(rcInfo, tool, option, new String[0]);
+					ManagedBuildManager.setOption(rcInfo, tool, options[i], new String[0]);
 			}
 		}
 	}