diff --git a/ChangeLog b/ChangeLog
index 84656a242..06767943b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-21  Robert Larice
+ * src/spicelib/devices/hisimhv/hsmhvset.c :
+   extend HSMHVunsetup() to process some more CKTmkVolt() generated nodes
+   FIXME, there are still some more to fix
+
 2011-05-21  Holger Vogt
  * windisp.c, winprint.c, windisp.h, winprint.h, display.c xdisplay.c,
    winmain.c: reduce compiler warnings 
diff --git a/src/spicelib/devices/hisimhv/hsmhvset.c b/src/spicelib/devices/hisimhv/hsmhvset.c
index a9fe0659e..bb670d1ce 100644
--- a/src/spicelib/devices/hisimhv/hsmhvset.c
+++ b/src/spicelib/devices/hisimhv/hsmhvset.c
@@ -1447,6 +1447,30 @@ HSMHVunsetup(
                 CKTdltNNum(ckt, here->HSMHVsNodePrime);
                 here->HSMHVsNodePrime = 0;
             }
+            if (here->HSMHVgNodePrime
+                    && here->HSMHVgNodePrime != here->HSMHVgNode)
+            {
+                CKTdltNNum(ckt, here->HSMHVgNodePrime);
+                here->HSMHVgNodePrime = 0;
+            }
+            if (here->HSMHVbNodePrime
+                    && here->HSMHVbNodePrime != here->HSMHVbNode)
+            {
+                CKTdltNNum(ckt, here->HSMHVbNodePrime);
+                here->HSMHVbNodePrime = 0;
+            }
+            if (here->HSMHVdbNode
+                    && here->HSMHVdbNode != here->HSMHVbNode)
+            {
+                CKTdltNNum(ckt, here->HSMHVdbNode);
+                here->HSMHVdbNode = 0;
+            }
+            if (here->HSMHVsbNode
+                    && here->HSMHVsbNode != here->HSMHVbNode)
+            {
+                CKTdltNNum(ckt, here->HSMHVsbNode);
+                here->HSMHVsbNode = 0;
+            }
         }
     }
 #endif