diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e3bb389c33..ef7975c10d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-03-09 16:47 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/gtclip.c
+    ! fixed two very bad bugs in get clipboard action used for W32 and
+      GTs which do not support system clipboard data
+
 2008-03-07 19:49 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbct/ctrand.prg
     ! fixed random() parameter interpretation - the action was reverted
diff --git a/harbour/source/rtl/gtclip.c b/harbour/source/rtl/gtclip.c
index 4ba24cd4f5..5bbbaf9413 100644
--- a/harbour/source/rtl/gtclip.c
+++ b/harbour/source/rtl/gtclip.c
@@ -82,9 +82,9 @@ BOOL hb_gt_getClipboard( char ** pszClipData, ULONG *pulLen )
    {
       *pszClipData = ( char * ) hb_xgrab( s_ulClipboardLen + 1 );
       memcpy( *pszClipData, s_szClipboardData, s_ulClipboardLen );
-      *pszClipData[ s_ulClipboardLen ] = '\0';
+      ( *pszClipData )[ s_ulClipboardLen ] = '\0';
    }
-   return *pulLen != 0;
+   return s_ulClipboardLen != 0;
 }
 
 #if defined( HB_OS_WIN_32 )
@@ -141,7 +141,7 @@ BOOL hb_gt_w32_getClipboard( UINT uFormat, char ** pszClipData, ULONG *pulLen )
             {
                *pszClipData = ( char * ) hb_xgrab( *pulLen + 1 );
                HB_TCHAR_GETFROM( *pszClipData, lptstr, *pulLen );
-               pszClipData[*pulLen] = '\0';
+               ( *pszClipData )[ *pulLen ] = '\0';
             }
             GlobalUnlock( hglb );
          }