diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 7fae09ba1a9..bb0673c7307 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,6 @@
+2002-10-15 Mikhail Khodjaiants
+	* CThread.java: The previous fix should be done only when switching between frames of the same thread.
+
 2002-10-14 Mikhail Khodjaiants
 	* CThread.java: Reset the register's change flag before switching to another frame.
 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
index 18e2789cf38..aaaeaacaf20 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
@@ -975,11 +975,11 @@ public class CThread extends CDebugElement
 		{
 			return;
 		}
-		((CDebugTarget)getDebugTarget()).resetRegisters();
 		try
 		{
 			if ( getLastStackFrame() != null )
 			{ 
+				((CDebugTarget)getDebugTarget()).resetRegisters();
 				getCDIThread().setCurrentStackFrame( ((CStackFrame)frame).getCDIStackFrame() );
 			}
 			setLastStackFrame( (CStackFrame)frame );