diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
index b2695666160..4a9cb41d567 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
@@ -71,6 +71,15 @@ public class CTarget  implements ICDITarget {
 	public ICDITarget getTarget() {
 		return this;
 	}
+	
+	/**
+	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDITarget#setCurrentThread(ICDIThread)
+	 */
+	public void setCurrentThread(ICDIThread cthread) throws CDIException {
+		if (cthread instanceof CThread) {
+			setCurrentThread((CThread)cthread);
+		}
+	}
 
 	/**
 	 */
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
index 2bf13763bcc..ac7a1a02b68 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CThread.java
@@ -86,6 +86,12 @@ public class CThread extends CObject implements ICDIThread {
 	/**
 	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIThread#setCurrentStackFrame(ICDIStackFrame)
 	 */
+	public void setCurrentStackFrame(ICDIStackFrame stackframe) throws CDIException {
+		if (stackframe instanceof  StackFrame) {
+			setCurrentStackFrame((StackFrame)stackframe);
+		}
+	}
+
 	public void setCurrentStackFrame(StackFrame stackframe) throws CDIException {
 		MISession mi = getCTarget().getCSession().getMISession();
 		CommandFactory factory = mi.getCommandFactory();