diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7ad96d25c3..56336d66ad 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,7 +1,11 @@
+19991207-20:25 GMT+3 Alexander Kresin
+  * source/pp/hbpp.c
+    * some changes, related to '@ ... clear to ...' problem
+
 Tue Dec 07 12:42:30 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
-	* source/rdd/dbcmd.c: 
-	Got rid of two warnings about unused variables.
+        * source/rdd/dbcmd.c:
+        Got rid of two warnings about unused variables.
 
 19991207-16:29 GMT+1 Victor Szel <info@szelvesz.hu>
   * tests/regress/*
@@ -231,23 +235,23 @@ Tue Dec 07 12:42:30 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
 Mon Nov 29 12:45:05 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
 
-	* include/hbtrace.h: 
-	* source/common/hbtrace.c: 
-	* source/rtl/trace.c: 
-	* doc/tracing.txt: 
-	Modified the run-time trace interface functions, to simplify this
-	interface. Now there are just two C functions:
-	
-	  current_state = hb_tracestate(new_state);
-	  current_level = hb_tracelevel(new_level);
+        * include/hbtrace.h:
+        * source/common/hbtrace.c:
+        * source/rtl/trace.c:
+        * doc/tracing.txt:
+        Modified the run-time trace interface functions, to simplify this
+        interface. Now there are just two C functions:
 
-	and just two Clipper functions:
-	
-	  current_state := HB_TRACESTATE( [new_state] )
-	  current_level := HB_TRACELEVEL( [new_level] )
+          current_state = hb_tracestate(new_state);
+          current_level = hb_tracelevel(new_level);
 
-	Both check their argument, so passing a -1 to any of them will
-	return the appropriate current setting without modifying it.
+        and just two Clipper functions:
+
+          current_state := HB_TRACESTATE( [new_state] )
+          current_level := HB_TRACELEVEL( [new_level] )
+
+        Both check their argument, so passing a -1 to any of them will
+        return the appropriate current setting without modifying it.
 
 19991128-22:24 GMT+1 Victor Szel <info@szelvesz.hu>
   * source/rtl/asort.prg
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index 2fdf1f7332..e7e5b2e890 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -1188,6 +1188,7 @@ static int WorkMarkers( char ** ptrmp, char ** ptri, char * ptro, int * lenres,
                     {
                       return 0;
                     }
+                    else lenreal = 0;
                 }
             }
         }
@@ -1386,9 +1387,11 @@ static int getExpReal( char * expreal, char ** ptri, BOOL prlist, int maxrez )
 
 static BOOL isExpres( char * stroka )
 {
+  int l1,l2;
   HB_TRACE(HB_TR_DEBUG, ("isExpres(%s)", stroka));
-
-  return strlen( stroka ) <= getExpReal( NULL, &stroka, FALSE, HB_PP_STR_SIZE );
+  l1 = strlen( stroka );
+  l2 = getExpReal( NULL, &stroka, FALSE, HB_PP_STR_SIZE );
+  return ( l1 <= l2 );
 }
 
 static BOOL TestOptional( char *ptr1, char *ptr2 )
@@ -2387,7 +2390,7 @@ static int ParsePragma( char * sLine )
                    pragma[ strlen( pragma ) - 1 ] == '-' )
                   hb_comp_iWarnings = IsOnOffSwitch( pragma, hb_comp_iWarnings != 0 ) ? 1 : 0;
                else
-               {  
+               {
                   /* There is -w<0,1,2,3> probably */
                   hb_comp_iWarnings = pragma[ 2 ] - '0';
                   if( hb_comp_iWarnings < 0 || hb_comp_iWarnings > 3 )