From 6f5627f44169bd4eb72dea3fb7d8f6d600ddcdb5 Mon Sep 17 00:00:00 2001
From: Markus Mueller <metroid120@googlemail.com>
Date: Tue, 21 Jul 2020 11:48:22 +0200
Subject: [PATCH] node collapsing BI BP HICUM

---
 src/spicelib/devices/hicum2/hicum2setup.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/spicelib/devices/hicum2/hicum2setup.c b/src/spicelib/devices/hicum2/hicum2setup.c
index 4de51d82a..cb3df9a87 100644
--- a/src/spicelib/devices/hicum2/hicum2setup.c
+++ b/src/spicelib/devices/hicum2/hicum2setup.c
@@ -617,11 +617,20 @@ HICUMsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states)
                   }
                 }
             }
-
-            if(here->HICUMbaseBINode == 0) {
+            if(model->HICUMrbi0 == 0) {
+                here->HICUMbaseBINode = here->HICUMbaseBPNode;
+            } else if(here->HICUMemitEINode == 0) {
                 error = CKTmkVolt(ckt, &tmp, here->HICUMname, "baseBI");
                 if(error) return(error);
                 here->HICUMbaseBINode = tmp->number;
+                if (ckt->CKTcopyNodesets) {
+                  if (CKTinst2Node(ckt,here,5,&tmpNode,&tmpName)==OK) {
+                     if (tmpNode->nsGiven) {
+                       tmp->nodeset=tmpNode->nodeset;
+                       tmp->nsGiven=tmpNode->nsGiven;
+                     }
+                  }
+                }
             }
 
             if (selfheat) {