diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
index b63fd5d066a..7fa2f2e0595 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CDebugTarget.java
@@ -634,12 +634,12 @@ public class CDebugTarget extends CDebugElement
 			}
 			else if ( event instanceof ICDISuspendedEvent )
 			{
-				if ( source instanceof ICDITarget )
+				if ( source instanceof ICDITarget || source instanceof ICDIThread )
 				{
 					handleSuspendedEvent( (ICDISuspendedEvent)event );
 				}
 			}
-			else if ( event instanceof ICDIResumedEvent )
+			else if ( event instanceof ICDIResumedEvent || source instanceof ICDIThread )
 			{
 				if ( source instanceof ICDITarget )
 				{