diff --git a/harbour/source/vm/macro.c b/harbour/source/vm/macro.c
index 4d18c48a30..f1cb7138e2 100644
--- a/harbour/source/vm/macro.c
+++ b/harbour/source/vm/macro.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * $Id$
  */
 
@@ -1191,13 +1191,7 @@ void hb_compGenPopVar( char * szVarName, HB_MACRO_DECL )
    }
    else
    {
-      HB_DYNS_PTR pSym = hb_dynsymFind( szVarName );
-
-      if( pSym && ! pSym->hMemvar )
-         hb_compMemvarGenPCode( HB_P_MPOPFIELD, szVarName, HB_MACRO_PARAM );
-      else
-         hb_compMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_MACRO_PARAM );
-
+      hb_compMemvarGenPCode( HB_P_MPOPMEMVAR, szVarName, HB_MACRO_PARAM );
       hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
    }
 }
@@ -1280,18 +1274,7 @@ void hb_compGenPushVar( char * szVarName, HB_MACRO_DECL )
    }
    else
    {
-      HB_DYNS_PTR pSym = hb_dynsymFind( szVarName );
-
-      if( pSym && pSym->hMemvar )
-         hb_compMemvarGenPCode( HB_P_MPUSHMEMVAR, szVarName, HB_MACRO_PARAM );
-
-      else if( pSym )
-         hb_compMemvarGenPCode( HB_P_MPUSHFIELD, szVarName, HB_MACRO_PARAM );
-
-      else
-         // Will result in: HB_MACRO_UNKN_SYM + ~HB_MACRO_CONT
-         hb_compMemvarGenPCode( HB_P_MPUSHVARIABLE, szVarName, HB_MACRO_PARAM );
-
+      hb_compMemvarGenPCode( HB_P_MPUSHVARIABLE, szVarName, HB_MACRO_PARAM );
       hb_compMemvarCheck( szVarName, HB_MACRO_PARAM );
    }
 }