diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 33bda71e9e..8f380519ab 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+
+2006-11-08 17:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/classes.c
+    ! fixed type checking for "string" type. It should be translate
       to character not symbol item type.
 
 2006-11-08 13:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 2ef387f0eb..2400e30bf6 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -1007,7 +1007,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState )
          ul = 0;
       }
    }
-   while( ( pState->pFile->pLineBuf ? pState->pFile->ulLineBufLen :
+   while( ( pState->pFile->pLineBuf ? pState->pFile->ulLineBufLen != 0 :
                                       !pState->pFile->fEof ) &&
           ( pState->fCanNextLine || 
             ( pState->iStreamDump && pState->iStreamDump != HB_PP_STREAM_CLIPPER ) ) );
@@ -3879,7 +3879,7 @@ static void hb_pp_preprocesToken( PHB_PP_STATE pState )
 
       if( !pState->pFile->pTokenList )
       {
-         while( pState->pFile->pLineBuf ? pState->pFile->ulLineBufLen :
+         while( pState->pFile->pLineBuf ? pState->pFile->ulLineBufLen != 0 :
                                           !pState->pFile->fEof )
          {
             hb_pp_getLine( pState );