diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 18de14829b..4ccded4005 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2006-11-25 20:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbexprb.c
+    ! fixed parenthesis in expression
+
+  * harbour/source/pp/ppcore.c
+    ! fixed code block tokens stringify
+
 2006-11-25 19:30 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbexpra.c
   * harbour/include/hbexprb.c
diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c
index 04513fd901..c8e0226900 100644
--- a/harbour/include/hbexprb.c
+++ b/harbour/include/hbexprb.c
@@ -884,7 +884,7 @@ static HB_EXPR_FUNC( hb_compExprUseRef )
             {
                char *szAlias = pExp->value.asAlias.pAlias->value.asSymbol;
                int iLen = strlen( szAlias );
-               if( ( iLen == 1 ) || ( iLen >= 4 && iLen <= 6 ) &&
+               if( ( iLen == 1 || ( iLen >= 4 && iLen <= 6 ) ) &&
                    memcmp( szAlias, "MEMVAR", iLen ) == 0 &&
                    pExp->value.asAlias.pVar->ExprType == HB_ET_VARIABLE )
                {  /* @M-> @MEMVAR-> or @MEMVA-> or @MEMV-> */
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 64cdd9a1ae..9975781f09 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -5049,10 +5049,10 @@ char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
    hb_membufFlush( pState->pBuffer );
    if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_LEFT_CB )
    {
-      int iBraces = 1;
-      pToken = pToken->pNext;
-      while( iBraces && !HB_PP_TOKEN_ISEOC( pToken ) )
+      int iBraces = 0;
+      do
       {
+         hb_pp_tokenStr( pToken, pState->pBuffer, iBraces != 0, FALSE, 0 );
          if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_AMPERSAND )
          {
             if( pToken->pNext &&
@@ -5066,9 +5066,9 @@ char * hb_pp_tokenBlockString( PHB_PP_STATE pState, PHB_PP_TOKEN pToken,
             --iBraces;
          else if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_LEFT_CB )
             ++iBraces;
-         hb_pp_tokenStr( pToken, pState->pBuffer, TRUE, FALSE, 0 );
          pToken = pToken->pNext;
       }
+      while( iBraces && !HB_PP_TOKEN_ISEOC( pToken ) );
    }
    hb_membufAddCh( pState->pBuffer, '\0' );
    return hb_membufPtr( pState->pBuffer );