diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ec75b0e7b9..8767892a03 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-21 10:40 UTC-0800 Ron Pinkas <ron@profit-master.com>
+   * contrib/dot/pp.prg
+     ! Changed MatchRule() to set sNextAnchor (for NextExp()) ONLY for NON optional Anchor.
+
 2001-06-21 09:50 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * contrib/dot/pp.prg
      + Added explicit support for Extended expression match marker, in NextExp()
diff --git a/harbour/contrib/dot/pp.prg b/harbour/contrib/dot/pp.prg
index 71fbfc561d..9479d967b2 100644
--- a/harbour/contrib/dot/pp.prg
+++ b/harbour/contrib/dot/pp.prg
@@ -3342,8 +3342,10 @@ STATIC FUNCTION MatchRule( sKey, sLine, aRules, aResults, bStatement, bUpper )
 
          ENDIF
 
-         IF nMatch < nMatches
+         IF nMatch < nMatches .AND. aRules[Counter][2][nMatch + 1][2] == 0 // Non Optional ONLY!
             sNextAnchor := aRules[Counter][2][nMatch + 1][3]
+         ELSE
+            sNextAnchor := NIL
          ENDIF
 
          IF bDbgMatch