diff --git a/src/spicelib/devices/nbjt/nbjt.c b/src/spicelib/devices/nbjt/nbjt.c
index e91190d9f..650f3e83d 100644
--- a/src/spicelib/devices/nbjt/nbjt.c
+++ b/src/spicelib/devices/nbjt/nbjt.c
@@ -56,10 +56,10 @@ IFparm NBJTmPTable[] = {	/* model parameters */
 };
 
 char *NBJTnames[] = {
-  "Collector",
-  "Base",
-  "Emitter",
-  "Substrate"
+  "Collector",                  /* 1 */
+  "Base",                       /* 2 */
+  "Emitter",                    /* 3 */
+  "Substrate"                   /* 4 */ // FIXME, excess entry ?!
 };
 
 int NBJTnSize = NUMELEMS(NBJTnames);
diff --git a/src/spicelib/devices/nbjt/nbjtdefs.h b/src/spicelib/devices/nbjt/nbjtdefs.h
index 911dac696..dce2cecec 100644
--- a/src/spicelib/devices/nbjt/nbjtdefs.h
+++ b/src/spicelib/devices/nbjt/nbjtdefs.h
@@ -40,9 +40,14 @@ typedef struct sNBJTinstance {
 #define NBJTdIcDVbe NBJTstate+7
 #define NBJTnumStates 8
 
+  /* GENnode[] { */
   int NBJTcolNode;		/* number of collector node of bjt */
   int NBJTbaseNode;		/* number of base node of bjt */
   int NBJTemitNode;		/* number of emitter node of bjt */
+  // FIXME,  substrate missing, see NBJTnames[]
+  // the next variable NBJTpDevice is in real danger !
+  /* } */
+
   ONEdevice *NBJTpDevice;
   GLOBvalues NBJTglobals;	/* Temp.-Dep. Global Parameters */
   int NBJTtype;
diff --git a/src/spicelib/devices/nbjt2/nbjt2def.h b/src/spicelib/devices/nbjt2/nbjt2def.h
index c66ac191a..381f7b904 100644
--- a/src/spicelib/devices/nbjt2/nbjt2def.h
+++ b/src/spicelib/devices/nbjt2/nbjt2def.h
@@ -40,9 +40,14 @@ typedef struct sNBJT2instance {
 #define NBJT2dIcDVbe NBJT2state+7
 #define NBJT2numStates 8
 
+  /* GENnode[] { */
   int NBJT2colNode;		/* number of collector node of bjt */
   int NBJT2baseNode;		/* number of base node of bjt */
   int NBJT2emitNode;		/* number of emitter node of bjt */
+  // FIXME,  substrate missing, see NBJTnames[]
+  // the next variable NBJTpDevice is in real danger !
+  /* } */
+
   double NBJT2width;		/* width factor for the bjt */
   double NBJT2area;		/* area factor for the bjt */
   TWOdevice *NBJT2pDevice;
diff --git a/src/spicelib/devices/nbjt2/nbt2.c b/src/spicelib/devices/nbjt2/nbt2.c
index 70071d04e..307f12d05 100644
--- a/src/spicelib/devices/nbjt2/nbt2.c
+++ b/src/spicelib/devices/nbjt2/nbt2.c
@@ -58,10 +58,10 @@ IFparm NBJT2mPTable[] = {	/* model parameters */
 
 
 char *NBJT2names[] = {
-  "Collector",
-  "Base",
-  "Emitter",
-  "Substrate"
+  "Collector",                  /* 1 */
+  "Base",                       /* 2 */
+  "Emitter",                    /* 3 */
+  "Substrate"                   /* 4 */ // FIXME, excess entry ?!
 };
 
 int NBJT2nSize = NUMELEMS(NBJT2names);