diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 08ae7380bc..2fed92b307 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-26 17:08 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbide/tags.prg
+    ! Fixed: to honor "CREATE CLASS " notation. It was breaking 
+       functions list navigation.
+
 2012-07-27 01:20 UTC+0200 Viktor Szakats (harbour syenar.net)
   + extras/hbusb/hbusb.hbc
   + extras/hbusb/hbusb.hbp
diff --git a/harbour/contrib/hbide/tags.prg b/harbour/contrib/hbide/tags.prg
index 13045677be..b66251dfbd 100644
--- a/harbour/contrib/hbide/tags.prg
+++ b/harbour/contrib/hbide/tags.prg
@@ -226,6 +226,7 @@ FUNCTION Summarize( aText, cComments, aSumData, nFileType )
                LEFTEQUAL( cLine, 'EXIT FUNC'         ) .OR. ;
                LEFTEQUAL( cLine, 'EXIT PROC'         ) .OR. ;
                LEFTEQUAL( cLine, 'CLASS '            ) .OR. ;
+               LEFTEQUAL( cLine, 'CREATE CLASS '     ) .OR. ;
                LEFTEQUAL( cLine, 'INIT CLASS '       )
 
                // check for multiline declaration
@@ -262,7 +263,7 @@ FUNCTION Summarize( aText, cComments, aSumData, nFileType )
                aAdd( aSummary, Str( nLine, 5, 0 ) + ': ' +  c )
 
                IF ! lInClass
-                  lInClass := LEFTEQUAL( cLine, 'CLASS ' )
+                  lInClass := LEFTEQUAL( cLine, 'CLASS ' ) .OR. LEFTEQUAL( cLine, 'CREATE CLASS ' )
                ENDIF
             ELSEIF LEFTEQUAL( cLine, "#PRAGMA BEGINDUMP" )
                nType  := 1