diff --git a/src/spicelib/devices/bsim4v6/b4v6set.c b/src/spicelib/devices/bsim4v6/b4v6set.c
index f009e7c91..e0354caf4 100644
--- a/src/spicelib/devices/bsim4v6/b4v6set.c
+++ b/src/spicelib/devices/bsim4v6/b4v6set.c
@@ -2478,6 +2478,27 @@ BSIM4v6unsetup(GENmodel *inModel, CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM4v6sNodePrime);
                 here->BSIM4v6sNodePrime = 0;
             }
+
+            if (here->BSIM4v6sbNode
+                && here->BSIM4v6sbNode != here->BSIM4v6bNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v6sbNode);
+                here->BSIM4v6sbNode = 0;
+            }
+
+            if (here->BSIM4v6bNodePrime
+                && here->BSIM4v6bNodePrime != here->BSIM4v6bNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v6bNodePrime);
+                here->BSIM4v6bNodePrime = 0;
+            }
+
+            if (here->BSIM4v6dbNode
+                && here->BSIM4v6dbNode != here->BSIM4v6bNode)
+            {
+                CKTdltNNum(ckt, here->BSIM4v6dbNode);
+                here->BSIM4v6dbNode = 0;
+            }
         }
     }
 #endif