diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 50201c4889b..8b9d1abf2b4 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,30 +1,34 @@
+2003-09-30 Mikhail Khodjaiants
+	Use the new 'equals' method of ICDIVaraiableObject to compare variables.
+	* CVariable.java
+	
 2003-09-30 Alain Magloire
 
 	ICDIVariableObject been updated with a new method.
 	* CVariable.java
 	* ICDIVariable.java
 
-2003-10-29 Mikhail Khodjaiants
+2003-09-29 Mikhail Khodjaiants
 	Fix for PR 43856: Format doesn't work for wchar_t.
 	* CValue.java
 
-2003-10-23 Mikhail Khodjaiants
+2003-09-23 Mikhail Khodjaiants
 	Changed the 'hasStackFrames' method of the 'CThread' class to return true regardless if 
 	the thread contains stack frames or not. This method is only used by UI to update the thread label.
 	* CThread.java
  
-2003-10-17 Mikhail Khodjaiants
+2003-09-17 Mikhail Khodjaiants
 	Temporary fix for PR 39061: Attach source does not work for applications compiled in CygWin.
 	* CDirectorySourceLocation.java
 
-2003-10-16 Mikhail Khodjaiants
+2003-09-16 Mikhail Khodjaiants
 	Fix for PR 38468: Error in files location.
 	Use the 'getCanonicalPath' method of the 'File' class to obtain the file name.
 	* CDirectorySourceLocation.java
 	* CProjectSourceLocation.java
 	* CSourceLocator.java
 
-2003-10-15 Mikhail Khodjaiants
+2003-09-15 Mikhail Khodjaiants
 	Fix for PR 43101: Breakpoint exception when source doesn't exist.
 	The 'fireBreakpointChanged' method of 'BreakpointManager' is used to notify 
 	the UI components that a breakpoint is added. This is a part of new implementation 
@@ -32,7 +36,7 @@
 	Check if delta is not null to avoid this problem.
 	* CDebugTarget.java
 
-2003-10-11 Mikhail Khodjaiants
+2003-09-11 Mikhail Khodjaiants
 	Detail Pane values for casted variables.
 	* CVariable.java: the qualified name should be chached in the InternalVariable instance
 	* CArrayPartition.java: added new field to store the chached value of the qualified name
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
index 7093743d89a..8fe753cf0c9 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
@@ -168,8 +168,9 @@ public abstract class CVariable extends CDebugElement
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIVariableObject#equals(org.eclipse.cdt.debug.core.cdi.model.ICDIVariableObject)
 		 */
-		public boolean equals(ICDIVariableObject varObject) {
-			return super.equals(varObject);
+		public boolean equals( ICDIVariableObject varObject )
+		{
+			return ( fVariableObject != null ) ? fVariableObject.equals( varObject ) : false;
 		}
 	}
 
@@ -987,7 +988,7 @@ public abstract class CVariable extends CDebugElement
 
 	protected boolean sameVariableObject( ICDIVariableObject object )
 	{
-		return ( fOriginal != null ) ? ( object.getName().equals( fOriginal.getCDIVariableObject().getName() ) ) : false;
+		return ( object != null && fOriginal != null ) ? ( object.equals( fOriginal.getCDIVariableObject() ) ) : false;
 	}
 
 	private boolean enableVariableBookkeeping()