diff --git a/src/spicelib/devices/bsim3/b3set.c b/src/spicelib/devices/bsim3/b3set.c
index 33cb88f98..24dcf3d1a 100644
--- a/src/spicelib/devices/bsim3/b3set.c
+++ b/src/spicelib/devices/bsim3/b3set.c
@@ -1146,6 +1146,11 @@ BSIM3unsetup(
                 CKTdltNNum(ckt, here->BSIM3sNodePrime);
                 here->BSIM3sNodePrime = 0;
             }
+            if (here->BSIM3qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM3qNode);
+                here->BSIM3qNode = 0;
+            }
         }
     }
     return OK;
diff --git a/src/spicelib/devices/bsim3v0/b3v0set.c b/src/spicelib/devices/bsim3v0/b3v0set.c
index 4243b7456..3a6028bc6 100644
--- a/src/spicelib/devices/bsim3v0/b3v0set.c
+++ b/src/spicelib/devices/bsim3v0/b3v0set.c
@@ -916,6 +916,11 @@ BSIM3v0unsetup(GENmodel *inModel, CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM3v0sNodePrime);
                 here->BSIM3v0sNodePrime = 0;
             }
+            if (here->BSIM3v0qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM3v0qNode);
+                here->BSIM3v0qNode = 0;
+            }
         }
     }
     return OK;
diff --git a/src/spicelib/devices/bsim3v1/b3v1set.c b/src/spicelib/devices/bsim3v1/b3v1set.c
index e3bedcbb9..aad19488a 100644
--- a/src/spicelib/devices/bsim3v1/b3v1set.c
+++ b/src/spicelib/devices/bsim3v1/b3v1set.c
@@ -976,6 +976,11 @@ BSIM3v1unsetup(GENmodel *inModel, CKTcircuit *ckt)
                 CKTdltNNum(ckt, here->BSIM3v1sNodePrime);
                 here->BSIM3v1sNodePrime = 0;
             }
+            if (here->BSIM3v1qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM3v1qNode);
+                here->BSIM3v1qNode = 0;
+            }
         }
     }
     return OK;
diff --git a/src/spicelib/devices/bsim3v32/b3v32set.c b/src/spicelib/devices/bsim3v32/b3v32set.c
index 991cb01ed..1803f5422 100644
--- a/src/spicelib/devices/bsim3v32/b3v32set.c
+++ b/src/spicelib/devices/bsim3v32/b3v32set.c
@@ -1158,6 +1158,11 @@ BSIM3v32unsetup(
                 CKTdltNNum(ckt, here->BSIM3v32sNodePrime);
                 here->BSIM3v32sNodePrime = 0;
             }
+            if (here->BSIM3v32qNode)
+            {
+                CKTdltNNum(ckt, here->BSIM3v32qNode);
+                here->BSIM3v32qNode = 0;
+            }
         }
     }
     return OK;