diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3d2c1e0b5c..a918e1e734 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-23 13:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/hbgtcore.c
+    ! fixed recent modification to work also with system clipboards
+
 2009-10-23 12:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rtl/hbgtcore.c
     + added default implementation for HB_GTI_CLIPBOARDPAST - thanks to
diff --git a/harbour/src/rtl/hbgtcore.c b/harbour/src/rtl/hbgtcore.c
index a0cdba490f..7a485f7423 100644
--- a/harbour/src/rtl/hbgtcore.c
+++ b/harbour/src/rtl/hbgtcore.c
@@ -1572,20 +1572,10 @@ static BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
          break;
 
       case HB_GTI_CLIPBOARDPAST:
-      {
-         /* get Clipboard value */
-         char * pszClipData;
-         ULONG ulLen;
-
-         if( hb_gt_getClipboard( &pszClipData, &ulLen ) )
-         {
-            HB_GTSELF_INKEYSETTEXT( pGT, pszClipData, ulLen );
-            hb_xfree( pszClipData );
-         }
-         else
-            HB_GTSELF_INKEYSETTEXT( pGT, NULL, 0 );
+         if( HB_GTSELF_INFO( pGT, HB_GTI_CLIPBOARDDATA, pInfo ) )
+            HB_GTSELF_INKEYSETTEXT( pGT, hb_itemGetCPtr( pInfo->pResult ),
+                                         hb_itemGetCLen( pInfo->pResult ) );
          break;
-      }
 
       case HB_GTI_NOTIFIERBLOCK:
          if( pGT->pNotifierBlock )