diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c30243ec6c..09b690ffd1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2005-09-20 10:16 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
+
+   * source/rtl/tget.prg
+     ! One previous fix reverted because it broke numeric data entry.
+       Solved from caller side for the meantime. TOFIX added.
+
 2005-08-23 22:01 UTC-0400 Alejandro de Garate <alex_degarate@hotmail.com>
 
    + doc\linux1st.txt
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index cf31177da4..b7013451f4 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -375,19 +375,20 @@ METHOD Display( lForced ) CLASS Get
 
    DEFAULT lForced TO .t.
 
-   // ; VarGet() has to be called everytime here to stay 
-   //   CA-Cl*pper compatible, please take care of that. [vszakats]
+   // ; TOFIX: VarGet() has to be called everytime here to stay 
+   //          CA-Cl*pper compatible.
+   //          Currently the caller needs to set :buffer to NIL 
+   //          to force that in Harbour. [vszakats]
 
    if ::buffer == nil
       ::Original := ::VarGet()
       ::Type     := ValType( ::Original )
-      ::picture  := ::cPicture
-      ::buffer   := ::PutMask( ::Original, .f. )
-   else
-      ::buffer   := ::PutMask( ::VarGet(), .f. )
+      ::picture := ::cPicture    //this sets also ::buffer
+// else
+//    xBuffer := ::VarGet() // ; Dummy call, to be CA-Cl*pper compatible. It doesn't work though for some reason. [vszakats]
    endif
 
-   xBuffer := ::buffer
+   xBuffer := ::buffer     //::PutMask( ::VarGet(), .f. )
 
    if ::Type == 'N' .AND. ::hasFocus .AND. ! ::lMinusPrinted .and. ;
          ! Empty( ::DecPos ) .and. ::minus .AND. ;