diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8291e0ebc8..70e0378b32 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-12 15:40 UTC+0100 Ryszard Glab <rglab@imid.med.pl>
+
+    *source/compiler/harbour.c
+	*fixed unused variable tmpFiles
+	
+    *source/vm/macro.c
+	*fixed bug when field variable was macro-compiled
+
 2000-06-11 23:30 UTC-0800 Ron Pinkas <Ron@Profit-Master.com>
 
    source/compiler/harbour.c
diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c
index 1d90ce3268..28b37c5328 100644
--- a/harbour/source/compiler/harbour.c
+++ b/harbour/source/compiler/harbour.c
@@ -3420,11 +3420,11 @@ int hb_compCompile( char * szPrg, int argc, char * argv[] )
          if( hb_compInclude( szFileName, NULL ) )
          {
             BOOL bSkipGen = FALSE ;
-            FILES tmpFiles ;
-
             #ifdef HB_NESTED_COMPILE
             if( bNested )
             {
+              FILES tmpFiles ;
+
                /* Complementary Save */
                hb_compSaveVars( &HarbourVars, 2 );
 
diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c
index e149eb3132..e87228b21c 100644
--- a/harbour/source/vm/macro.c
+++ b/harbour/source/vm/macro.c
@@ -824,6 +824,9 @@ ULONG hb_compGenJumpTrue( LONG lOffset, HB_MACRO_DECL )
 */
 static void hb_compMemvarCheck( char * szVarName, HB_MACRO_DECL )
 {
+   if( HB_MACRO_DATA->Flags & HB_MACRO_GEN_TYPE )
+   {
+      /* Test if variable exist if called from TYPE() function only */
       if( !( HB_MACRO_DATA->status & (HB_MACRO_UNKN_VAR | HB_MACRO_UNKN_SYM) ) )
       {
          /* checking for variable is quite expensive than don't check it
@@ -836,6 +839,7 @@ static void hb_compMemvarCheck( char * szVarName, HB_MACRO_DECL )
             HB_MACRO_DATA->status &= ~HB_MACRO_CONT;  /* don't run this pcode */
          }
       }
+   }
 }
 
 /*