Index: tol/btol/bgrammar/nameblock.cpp
===================================================================
--- tol/btol/bgrammar/nameblock.cpp	(revision de17be67348e995a5139940ea6cc10eb773fd450)
+++ tol/btol/bgrammar/nameblock.cpp	(revision 0990bb952ef17287810be2fed4d85f0c092d6202)
@@ -217,8 +217,16 @@
   owner_ = NULL;
   for(n=1; n<=set_.Card(); n++)
-	{
-    if(set_[n])
+  {
+    if( set_[n] )
     { 
       set_[n]->PutNameBlock(NULL);
+      BSyntaxObject *obj = set_[n];
+      if( obj->Grammar() == GraCode() ) {
+        BUserCode* uCode = UCode(obj);
+        BOperator* opr   = GetOperator(uCode);
+        if ( opr->NameBlock() && opr->NameBlock() == this ) {
+          opr->PutNameBlock( NULL );
+        }
+      }
     }
   }