diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6e0afed47a..713daf2ee9 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+19991219-14:35 GMT+1 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/compiler/harbour.l
+	* fixed recognition of 'DO &var WITH' syntax
+    
 19991219-15:55 GMT+3 Alexander Kresin
   * source/pp/hbpp.c
     * Bug fixed, reported by Victor Szel
diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l
index fff01478f5..3d5e697fc1 100644
--- a/harbour/source/compiler/harbour.l
+++ b/harbour/source/compiler/harbour.l
@@ -1097,7 +1097,11 @@ Separator     {SpaceTab}
 <WITH_>{Separator}*.            {
                 if( i_INDEX_STATE ) BEGIN INDEX; else BEGIN 0;
                 unput( yytext[ yyleng-1 ] );
-                if( hb_comp_iState == WHILE || hb_comp_iState == DO || hb_comp_iState == IDENTIFIER )
+                if( hb_comp_iState == WHILE || 
+		    hb_comp_iState == DO || 
+		    hb_comp_iState == MACROVAR || 
+		    hb_comp_iState == MACROTEXT || 
+		    hb_comp_iState == IDENTIFIER )
                 { /* DO <ident> WITH <arg> */
                   hb_comp_iState =WITH;
                   return WITH;