diff --git a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/CDebuggerTab.java b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/CDebuggerTab.java
index 484b18172b8..8e54267df8d 100644
--- a/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/CDebuggerTab.java
+++ b/plugins/org.eclipse.dd.gdb.ui/src/org/eclipse/dd/gdb/internal/ui/launching/CDebuggerTab.java
@@ -15,7 +15,6 @@ package org.eclipse.dd.gdb.internal.ui.launching;
 
 import java.io.IOException;
 import java.text.Collator;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -337,7 +336,7 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 		if (!validateDebuggerConfig(config)) {
 			return false;
 		}
-		ICDebugConfiguration debugConfig = getDebugConfig();
+//		ICDebugConfiguration debugConfig = getDebugConfig();
 //		if (fAttachMode && !debugConfig.supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH)) {
 //			setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
 //					                            (Object[]) new String[]{ICDTLaunchConfigurationConstants.DEBUGGER_MODE_ATTACH})); 
@@ -348,11 +347,11 @@ public class CDebuggerTab extends AbstractCDebuggerTab {
 //					                            (Object[]) new String[]{IGDBLaunchConfigurationConstants.DEBUGGER_MODE_REMOTE})); 
 //			return false;			
 //		}
-		if (!fAttachMode && !fRemoteMode && !debugConfig.supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
-			setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
-                    (Object[]) new String[]{ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN}));
-			return false;
-		}
+//		if (!fAttachMode && !fRemoteMode && !debugConfig.supportsMode(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
+//			setErrorMessage(MessageFormat.format(LaunchMessages.getString("CDebuggerTab.Mode_not_supported"), //$NON-NLS-1$
+//                    (Object[]) new String[]{ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN}));
+//			return false;
+//		}
 		if (fStopInMain != null && fStopInMainSymbol != null) {
 			// The "Stop on startup at" field must not be empty
 			String mainSymbol = fStopInMainSymbol.getText().trim();
diff --git a/plugins/org.eclipse.dd.gdb/plugin.xml b/plugins/org.eclipse.dd.gdb/plugin.xml
index e09d01321cf..73379f33ace 100644
--- a/plugins/org.eclipse.dd.gdb/plugin.xml
+++ b/plugins/org.eclipse.dd.gdb/plugin.xml
@@ -23,7 +23,7 @@
             class="org.eclipse.dd.gdb.internal.provisional.launching.GDBDebugger"
             cpu="native"
             id="org.eclipse.dd.gdb.GdbDebugger"
-            modes="run,core,attach"
+            modes="dsf"
             name="gdb/mi"
             platform="*">
       </debugger>
@@ -31,7 +31,7 @@
             class="org.eclipse.dd.gdb.internal.provisional.launching.GDBServerDebugger"
             cpu="*"
             id="org.eclipse.dd.gdb.GdbServerDebugger"
-            modes="run"
+            modes="dsf"
             name="gdbserver Debugger"
             platform="*">
       </debugger>