diff --git a/src/spicelib/devices/hicum2/hicum2setup.c b/src/spicelib/devices/hicum2/hicum2setup.c
index 565a3abf4..646d298e3 100644
--- a/src/spicelib/devices/hicum2/hicum2setup.c
+++ b/src/spicelib/devices/hicum2/hicum2setup.c
@@ -815,6 +815,11 @@ HICUMunsetup(
                 CKTdltNNum(ckt, here->HICUMcollCINode);
             here->HICUMcollCINode = 0;
 
+            if (here->HICUMbaseBINode > 0
+                && here->HICUMbaseBPNode != here->HICUMbaseBINode)
+                CKTdltNNum(ckt, here->HICUMbaseBINode);
+            here->HICUMbaseBINode = 0;
+
             if (here->HICUMbaseBPNode > 0
                 && here->HICUMbaseBPNode != here->HICUMbaseNode)
                 CKTdltNNum(ckt, here->HICUMbaseBPNode);
@@ -830,11 +835,6 @@ HICUMunsetup(
                 CKTdltNNum(ckt, here->HICUMsubsSINode);
             here->HICUMsubsSINode = 0;
 
-            if (here->HICUMbaseBINode > 0
-                && here->HICUMbaseBPNode != here->HICUMbaseBINode)
-                CKTdltNNum(ckt, here->HICUMbaseBINode);
-            here->HICUMbaseBINode = 0;
-
             if (selfheat) {
                 if (here->HICUMtempNode > 5) { // it is an internal node
                      CKTdltNNum(ckt, here->HICUMtempNode);