diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 51b36b1f4f..508d8d02e7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-13 07:45 UTC+0800 Ron Pinkas <ron@profit-master.com>
+   * source/compiler/harbour.slx
+     * Corrected premature release of MACROTEXT
+
 2000-07-12 20:45 UTC+0800 Ron Pinkas <ron@profit-master.com>
    * source/compiler/harbour.slx
      * Corrected support for PARAMETERS
diff --git a/harbour/source/compiler/harbour.slx b/harbour/source/compiler/harbour.slx
index c83a629d89..6ed04ae924 100644
--- a/harbour/source/compiler/harbour.slx
+++ b/harbour/source/compiler/harbour.slx
@@ -944,9 +944,7 @@ LANGUAGE_RULES_ARE {
 	       }\
 	       else\
 	       {\
-                  yytext = hb_strdup( yytext );\
-		  aTexts[iTexts++] = yytext; \
-		  /* printf( "Text %i At: %i for %s\n", iTexts, aTexts[iTexts - 1], aTexts[iTexts - 1] ); */\
+                  yytext = hb_compIdentifierNew( yytext, TRUE );\
 \
                   yylval.string = yytext;\
 	       	  iRet = MACROTEXT;\
@@ -954,9 +952,7 @@ LANGUAGE_RULES_ARE {
 	    }\
 	    else\
 	    {\
-               yytext = hb_strdup( yytext );\
-	       aTexts[iTexts++] = yytext;\
-	       /* printf( "Text %i At: %i for %s\n", iTexts, aTexts[iTexts - 1], aTexts[iTexts - 1] ); */\
+               yytext = hb_compIdentifierNew( yytext, TRUE );\
 \
                yylval.string = yytext;\
 	       iRet = MACROTEXT;\