diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 605af60150..4d0a73743c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-06 14:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/hbtoken.c
+    ! fixed using delimiters longer then 1 character
+
 2007-04-06 11:36 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/lang/msgnl.c
     * added missing $\Date$ in version string
diff --git a/harbour/source/rtl/hbtoken.c b/harbour/source/rtl/hbtoken.c
index 36351795a9..e2af2be120 100644
--- a/harbour/source/rtl/hbtoken.c
+++ b/harbour/source/rtl/hbtoken.c
@@ -79,6 +79,7 @@ static ULONG hb_tokenCount( char * szLine, ULONG ulLen,
          {
             while( ++ul < ulLen && szLine[ ul ] == ' ' );
          }
+         ul += ulDelim - 1;
       }
       ++ul;
    }
@@ -117,7 +118,7 @@ static char * hb_tokenGet( char * szLine, ULONG ulLen,
             while( ul < ulLen && szLine[ ul + 1 ] == ' ' )
                ++ul;
          }
-         ulStart = ul + 1;
+         ulStart = ul + ulDelim;
       }
    }
    if( --ulToken == 0 )
@@ -161,7 +162,7 @@ static PHB_ITEM hb_tokenArray( char * szLine, ULONG ulLen,
                while( ul < ulLen && szLine[ ul + 1 ] == ' ' )
                   ++ul;
             }
-            ulStart = ul + 1;
+            ulStart = ul + ulDelim;
          }
       }
       hb_itemPutCL( hb_arrayGetItemPtr( pArray, ++ulToken ), szLine + ulStart, ul - ulStart );