diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 86c5ea200d..4162aabdf3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-10-13 12:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/hbdead.c
+    % minor improvement
+
 2007-10-13 02:13 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/macro/macro.yyc
   * harbour/source/macro/macro.yyh
diff --git a/harbour/source/compiler/hbdead.c b/harbour/source/compiler/hbdead.c
index 4a9c45527b..32cd9fc813 100644
--- a/harbour/source/compiler/hbdead.c
+++ b/harbour/source/compiler/hbdead.c
@@ -335,7 +335,8 @@ static HB_CODETRACE_FUNC( hb_p_switch )
    }
    hb_compCodeTraceMark( cargo, ulStart, lPCodePos - ulStart );
 
-   return hb_compCodeTraceNextPos( cargo, lPCodePos );
+   return hb_compCodeTraceNextPos( cargo, us > usCases ?
+                                   cargo->ulPCodeSize : lPCodePos );
 }
 
 static HB_CODETRACE_FUNC( hb_p_endblock )