diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cc2c7d96f5..824208fcdc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-29 15:41 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/dates.c
+    ! fixed HB_TTOC() to not add leading space when date part is empty
+
 2009-10-29 15:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   + harbour/doc/xhb-diff.txt
     + added text which describes most important differences between Harbour
diff --git a/harbour/src/rtl/dates.c b/harbour/src/rtl/dates.c
index 024f04a374..d8e3ce46b5 100644
--- a/harbour/src/rtl/dates.c
+++ b/harbour/src/rtl/dates.c
@@ -518,7 +518,8 @@ char * hb_timeStampFormat( char * szBuffer,
    hb_dateDecStr( szDate, lJulian );
    hb_dateFormat( szDate, szBuffer, szDateFormat );
    szTimeBuffer = szBuffer + strlen( szBuffer );
-   *szTimeBuffer++ = ' ';
+   if( *szBuffer )
+      *szTimeBuffer++ = ' ';
    hb_timeFormat( szTimeBuffer, szTimeFormat, lMilliSec );
 
    return szBuffer;