diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 49dacfb3ab..b7a0c73844 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2004-02-15 04:20 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
+
+   * source/rtl/tget.prg
+     ! :display() fixed to always evaluate the get block before 
+       displaying like in C52.
+
+   * include/hbapifs.h
+     + HB_FFIND structure extended for future changes.
+
 2004-02-15 03:42 UTC+0100 Viktor Szakats <viktor.szakats@syenar.hu>
 
    * source/rdd/dbcmd.c
diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h
index 2bc6a681cc..4fe4083db1 100644
--- a/harbour/include/hbapifs.h
+++ b/harbour/include/hbapifs.h
@@ -174,14 +174,20 @@ extern FHANDLE hb_spCreateEx( BYTE * pFilename, USHORT uiAttr, USHORT uiFlags );
 /* File Find API structure */
 typedef struct
 {
-   char      szName[ _POSIX_PATH_MAX + 1 ];
-   LONG      lDate;
-   char      szDate[ 9 ]; /* in YYYYMMDD format */
-   char      szTime[ 9 ]; /* in HH:MM:SS format */
-   USHORT    attr;
-   ULONG     size; /* TOFIX: Use LONGLONG or double instead */
+   char   szName[ _POSIX_PATH_MAX + 1 ];
+   LONG   lDate;
+   char   szDate[ 9 ]; /* in YYYYMMDD format */
+   char   szTime[ 9 ]; /* in HH:MM:SS format */
+   USHORT attr;
+   ULONG  size; /* TOFIX: Use LONGLONG or double instead */
 
-   void *    info; /* Pointer to the platform specific find info */
+   /* Private */
+
+   const char * pszFileMask;
+   USHORT attrmask;
+   BOOL   bFirst;
+
+   void * info; /* Pointer to the platform specific find info */
 
 } HB_FFIND, * PHB_FFIND;
 
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index b18afe36fb..2e9f72b9b8 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -367,11 +367,10 @@ METHOD Display( lForced ) CLASS Get
 
    if ::buffer == nil
       ::picture := ::cPicture
-      xBuffer   := ::PutMask( ::VarGet(), .f. )
-   else
-      xBuffer   := ::buffer
    endif
 
+   xBuffer := ::PutMask( ::VarGet(), .f. )
+
    if ! ::lMinusPrinted .and. ! Empty( ::DecPos ) .and. ::minus .and. substr( xBuffer, ::DecPos-1, 1 ) == "0"
       xBuffer := substr( xBuffer, 1, ::DecPos - 2 ) + "-." + substr( xBuffer, ::DecPos + 1 )
    endif
@@ -541,7 +540,7 @@ METHOD VarPut( xValue, lReFormat ) CLASS Get
 
    DEFAULT lReFormat TO .t.
 
-   if ::block != nil
+   if ValType( ::Block ) == 'B'
       Eval( ::block, xValue )
       if lReFormat
          if !::hasfocus