diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 09f6525599..4fc3e4335c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-19 10:40 UTC+0800 Ron Pinkas <ron@profit-master.com>
+   * source/pp/ppcore.c
+     ! Corrected JFL previous change, which commented a fix that solved problem with code like "@&Row,...".
+       This fix will address both the #xtranslate @@ => ... as well as the previous needed fix.
+
 2000-09-20 00:52 UTC+0200 JFL (mafact) <jfl@mafact.com>
    * source/pp/ppcore.c
      corrected #command @@ => ...
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 4ac4f422bc..88c0805694 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -2528,20 +2528,14 @@ int hb_pp_RdStr( FILE * handl_i, char * buffer, int maxlen, BOOL lDropSpaces, ch
             case ';':
                bNewLine = TRUE;
                break;
-
-            /* JFL 2000-09-19 */
-            /* Supressed this code wich avoid the use of #command @@ => ...
-            /* I'm not sure what it was intended for ... so I let it here commented */
-/*          case '@':
-              if( bNewLine && sBuffer[ *iBuffer ] != ' ' && sBuffer[ *iBuffer ] != '\t' )
+           case '@':
+              if( bNewLine && ( sBuffer[ *iBuffer ] == '&' || sBuffer[ *iBuffer ] == '-' ) )
               {
                  buffer[readed++] = cha;
                  s_prevchar = cha;
                  cha = ' ';
               }
               break;
-*/
-
             /* Ron Pinkas end 2000-06-01 */
             }
             if( cha != ' ' && cha != ';' ) s_prevchar = cha;