diff --git a/src/spicelib/devices/bjt2/bjt2load.c b/src/spicelib/devices/bjt2/bjt2load.c
index 8c0ad76de..cfa9ac8a3 100644
--- a/src/spicelib/devices/bjt2/bjt2load.c
+++ b/src/spicelib/devices/bjt2/bjt2load.c
@@ -331,7 +331,7 @@ BJT2load(GENmodel *inModel, CKTcircuit *ckt)
                 cbhat= *(ckt->CKTstate0 + here->BJT2cb)+ *(ckt->CKTstate0 + 
                         here->BJT2gpi)*delvbe+ *(ckt->CKTstate0 + here->BJT2gmu)*
                         delvbc;
-
+#ifndef NOBYPASS
                 /*
                  *    bypass if solution has not changed
                  */
@@ -375,7 +375,7 @@ BJT2load(GENmodel *inModel, CKTcircuit *ckt)
                     cdsub = *(ckt->CKTstate0 + here->BJT2cdsub);
                     goto load;
                 }
-
+#endif /*NOBYPASS*/
                 /*
                  *   limit nonlinear branch voltages
                  */
diff --git a/src/spicelib/devices/bsim1/b1ld.c b/src/spicelib/devices/bsim1/b1ld.c
index e268dee91..be4a3de33 100644
--- a/src/spicelib/devices/bsim1/b1ld.c
+++ b/src/spicelib/devices/bsim1/b1ld.c
@@ -119,7 +119,9 @@ B1load(GENmodel *inModel, CKTcircuit *ckt)
     double vt0 = 0.0;
     double args[8];
     int    ByPass = 0;
+#ifndef NOBYPASS
     double tempv = 0.0;
+#endif /*NOBYPASS*/
     int error = 0;
 
     double m; /* parallel multiplier */
@@ -275,6 +277,7 @@ B1load(GENmodel *inModel, CKTcircuit *ckt)
                     *(ckt->CKTstate0 + here->B1gbd) * delvbd +
                     *(ckt->CKTstate0 + here->B1gbs) * delvbs ;
 
+#ifndef NOBYPASS
                     /* now lets see if we can bypass (ugh) */
 
                 /* following should be one big if connected by && all over
@@ -338,6 +341,7 @@ B1load(GENmodel *inModel, CKTcircuit *ckt)
                         goto line850;
                     }
                 }
+#endif /*NOBYPASS*/
 
                 von = model->B1type * here->B1von;
                 if(*(ckt->CKTstate0 + here->B1vds) >=0) {