diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index 770f414b57f..dac63d59db5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -354,7 +354,7 @@ public class VariableManager extends SessionObject implements ICDIVariableManage
 	/**
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObjects(ICDIStackFrame)
 	 */
-	public ICDIVariableObject[] getVariableObjects(ICDIStackFrame frame) throws CDIException {
+	public ICDIVariableObject[] getLocalVariableObjects(ICDIStackFrame frame) throws CDIException {
 		List varObjects = new ArrayList();
 		Session session = (Session)getSession();
 		ICDITarget currentTarget = session.getCurrentTarget();
@@ -389,6 +389,16 @@ public class VariableManager extends SessionObject implements ICDIVariableManage
 		return (ICDIVariableObject[])varObjects.toArray(new ICDIVariableObject[0]);
 	}
 
+	/**
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getVariableObjects(ICDIStackFrame)
+	 */
+	public ICDIVariableObject[] getVariableObjects(ICDIStackFrame frame) throws CDIException {
+		ICDIVariableObject[] locals = getLocalVariableObjects(frame);
+		ICDIVariableObject[] args = getArgumentObjects(frame);
+		ICDIVariableObject[] vars = new ICDIVariableObject[locals.length + args.length];
+		return vars;
+	}
+
 	/**
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#createVariable(ICDIVariableObject)
 	 */