diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
index 10605efdb15..9eff2610e8c 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCDILaunchDelegate.java
@@ -407,6 +407,13 @@ public class LocalCDILaunchDelegate extends AbstractCLaunchDelegate {
 			if (ICDTLaunchConfigurationConstants.DEBUGGER_MODE_CORE.equals(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)))
 				return true; 
 		}
+		if (mode.equals(ILaunchManager.RUN_MODE)) {
+			// We plan on splitting the Run delegate from the Debug one.
+			// For now, to keep backwards-compatibility, we need to keep the same delegate (to keep its id)
+			// However, we can just call the new delegate class
+			new LocalRunLaunchDelegate().preLaunchCheck(config, mode, monitor);
+		}
+
 		return super.preLaunchCheck(config, mode, monitor);
 	}