diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a272ba854a..30ee12735b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-07 12:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Two minor fixes to prev.
+
 2011-03-07 12:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to recognize filters in options having ${} macros,
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 5034e0b198..7fa7144fe4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -9478,9 +9478,10 @@ STATIC FUNCTION ArchCompFilter( hbmk, cItem )
       IF !( SubStr( cItem, nStart - 1, 1 ) $ _MACRO_PREFIX_ALL )
          EXIT
       ENDIF
+      nEnd += Len( _MACRO_CLOSE )
    ENDDO
 
-   IF nStart > 0
+   IF nStart > 0 .AND. nEnd > 0
 
       /* Separate filter from the rest of the item */
       cFilterSrc := SubStr( cItem, nStart + Len( _MACRO_OPEN ), nEnd - nStart - Len( _MACRO_OPEN ) )