Index: tol/btol/bgrammar/nameblock.cpp
===================================================================
--- tol/btol/bgrammar/nameblock.cpp	(revision a4cc221475fa4cf2441a0fc71404ed05969282d9)
+++ tol/btol/bgrammar/nameblock.cpp	(revision 170ff1f54906328e1441380523501df16d3441f6)
@@ -510,4 +510,6 @@
           if(obj)
           {
+            if(obj->Name()=="CmdInvoke")
+              printf("");
             newNameBlock.AddElement(obj,true,false);
           }
@@ -793,5 +795,7 @@
       BUserCode* uCode = UCode(obj);
       BOperator* opr   = GetOperator(uCode);
-      if(opr && !opr->System() && !opr->NameBlock())
+      if(opr && !opr->System() && !opr->NameBlock() && 
+        (opr->Name()==obj->Name()) && 
+        (opr->Level()==obj->Level()))
       {
         opr->PutNameBlock(this);