diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ff45da96c7..5166c4fe8b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-01-05 01:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * source/rtl/tpopup.prg
+     ! Fixed typo in POPUPMENU():getAccel(), causing wrong 
+       position being returned. Reported by Jose Miguel.
+
+   * source/rtl/ttopbar.prg
+     ! Changed HB_C52_STRICT guards to HB_EXTENSION.
+
 2007-12-28 15:51 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   * source/rtl/tbrowse.prg
     Method DispCell()
diff --git a/harbour/source/rtl/tpopup.prg b/harbour/source/rtl/tpopup.prg
index d1158924bb..9a4de2ee60 100644
--- a/harbour/source/rtl/tpopup.prg
+++ b/harbour/source/rtl/tpopup.prg
@@ -321,7 +321,7 @@ METHOD getAccel( xKey ) CLASS POPUPMENU
          nPos != Len( cCaption ) .AND. ;
          xKey == Lower( SubStr( cCaption, nPos + 1, 1 ) )
 
-         RETURN nPos
+         RETURN tmp
       ENDIF
    NEXT
 
diff --git a/harbour/source/rtl/ttopbar.prg b/harbour/source/rtl/ttopbar.prg
index 77f8df70e1..a5da5ea879 100644
--- a/harbour/source/rtl/ttopbar.prg
+++ b/harbour/source/rtl/ttopbar.prg
@@ -308,11 +308,11 @@ METHOD getAccel( nKey ) CLASS TOPBARMENU
          IF ( nAt := At( "&", ::aItems[ n ]:caption ) ) > 0 .AND. ;
             Upper( SubStr( ::aItems[ n ]:caption, nAt + 1, 1 ) ) == cKey
       
-#ifndef HB_C52_STRICT
+#ifdef HB_EXTENSION
             IF ::aItems[ n ]:enabled
 #endif
                RETURN n
-#ifndef HB_C52_STRICT
+#ifdef HB_EXTENSION
             ENDIF
 #endif
          ENDIF
@@ -355,11 +355,11 @@ METHOD hitTest( nMRow, nMCol ) CLASS TOPBARMENU
          nColumn := aItems[ n ]:__col
 
          IF nMCol >= nColumn .AND. nMCol <= nColumn + Len( aItems[ n ]:caption )
-#ifndef HB_C52_STRICT
+#ifdef HB_EXTENSION
             IF aItems[ n ]:enabled
 #endif
                RETURN n
-#ifndef HB_C52_STRICT
+#ifdef HB_EXTENSION
             ENDIF
 #endif
          ENDIF