diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java
index 3110c8ffbcd..077caf39d5a 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SuspendedEvent.java
@@ -53,6 +53,11 @@ public class SuspendedEvent implements ICDISuspendedEvent {
 	 */
 	public ICDIObject getSource() {
 		CTarget target = session.getCTarget();
+
+		// This not necessary, we can send the target as the source
+		// it will mean to cdi that all threads are suspended.
+		// FIXME: Remove this comment code after testing.
+		/*
 		int threadId = 0;
 		if (event instanceof MIBreakpointEvent) {
 			MIBreakpointEvent breakEvent = (MIBreakpointEvent) event;
@@ -84,7 +89,7 @@ public class SuspendedEvent implements ICDISuspendedEvent {
 			}
 		} catch (CDIException e) {
 		}
-		
+		*/
 		return target;
 	}
 }