diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 71b112460a8..097ea0d5825 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-29 Mikhail Khodjaiants
+	Bug 155275: Exception when stepping.
+	* CThread.java
+
 2006-08-14 Mikhail Khodjaiants
 	Bug 136896: View variables in binary format.
 	Applied modified patch from Mark Mitchell (CodeSourcery).
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 a05a59e31df..5571d3c722b 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
@@ -155,7 +155,7 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 				int depth = getStackDepth();
 				if ( depth >= getMaxStackDepth() )
 					depth = getMaxStackDepth() - 1;
-				ICDIStackFrame[] frames = ( depth != 0 ) ? getCDIStackFrames( 0, depth ) : new ICDIStackFrame[0];
+				ICDIStackFrame[] frames = ( depth != 0 ) ? getCDIStackFrames( 0, depth - 1 ) : new ICDIStackFrame[0];
 				
 				if ( fStackFrames.isEmpty() ) {
 					if ( frames.length > 0 ) {