diff --git a/src/spicelib/devices/bsim3/b3mpar.c b/src/spicelib/devices/bsim3/b3mpar.c
index 807dd158f..9965c07be 100644
--- a/src/spicelib/devices/bsim3/b3mpar.c
+++ b/src/spicelib/devices/bsim3/b3mpar.c
@@ -141,7 +141,7 @@ GENmodel *inMod)
         case BSIM3_MOD_NGATE:
             mod->BSIM3ngate = value->rValue;
             mod->BSIM3ngateGiven = TRUE;
-            if (mod->BSIM3ngate > 1.0e23)
+            if (mod->BSIM3ngate > 1.000001e24)
                 mod->BSIM3ngate *= 1.0e-6;
             break;
         case BSIM3_MOD_GAMMA1:
diff --git a/src/spicelib/devices/bsim3v1/b3v1mpar.c b/src/spicelib/devices/bsim3v1/b3v1mpar.c
index 4ed0180da..b99cb7ec5 100644
--- a/src/spicelib/devices/bsim3v1/b3v1mpar.c
+++ b/src/spicelib/devices/bsim3v1/b3v1mpar.c
@@ -124,7 +124,7 @@ BSIM3v1mParam(int param, IFvalue *value, GENmodel *inMod)
         case BSIM3v1_MOD_NGATE:
             mod->BSIM3v1ngate = value->rValue;
             mod->BSIM3v1ngateGiven = TRUE;
-            if (mod->BSIM3v1ngate > 1.0e23)
+            if (mod->BSIM3v1ngate > 1.000001e24)
               mod->BSIM3v1ngate *= 1.0e-6;
             break;
         case BSIM3v1_MOD_GAMMA1:
diff --git a/src/spicelib/devices/bsim3v32/b3v32mpar.c b/src/spicelib/devices/bsim3v32/b3v32mpar.c
index c3ec08c2a..33112c05a 100644
--- a/src/spicelib/devices/bsim3v32/b3v32mpar.c
+++ b/src/spicelib/devices/bsim3v32/b3v32mpar.c
@@ -135,7 +135,7 @@ BSIM3v32mParam(int param, IFvalue *value, GENmodel *inMod)
         case BSIM3v32_MOD_NGATE:
             mod->BSIM3v32ngate = value->rValue;
             mod->BSIM3v32ngateGiven = TRUE;
-            if (mod->BSIM3v32ngate > 1.0e23)
+            if (mod->BSIM3v32ngate > 1.000001e24)
                 mod->BSIM3v32ngate *= 1.0e-6;
             break;
         case BSIM3v32_MOD_GAMMA1:
diff --git a/src/spicelib/devices/bsim4/b4mpar.c b/src/spicelib/devices/bsim4/b4mpar.c
index dcc118d40..e7e47ad2d 100644
--- a/src/spicelib/devices/bsim4/b4mpar.c
+++ b/src/spicelib/devices/bsim4/b4mpar.c
@@ -320,13 +320,13 @@ GENmodel *inMod)
         case BSIM4_MOD_NSD:
             mod->BSIM4nsd = value->rValue;
             mod->BSIM4nsdGiven = TRUE;
-            if (mod->BSIM4nsd > 1.0e23)
+            if (mod->BSIM4nsd > 1.000001e24)
                 mod->BSIM4nsd *= 1.0e-6;
             break;
         case BSIM4_MOD_NGATE:
             mod->BSIM4ngate = value->rValue;
             mod->BSIM4ngateGiven = TRUE;
-            if (mod->BSIM4ngate > 1.0e23)
+            if (mod->BSIM4ngate > 1.000001e24)
                 mod->BSIM4ngate *= 1.0e-6;
             break;
         case BSIM4_MOD_GAMMA1:
diff --git a/src/spicelib/devices/bsim4v5/b4v5mpar.c b/src/spicelib/devices/bsim4v5/b4v5mpar.c
index 17f9ec4a6..0ebc1e962 100644
--- a/src/spicelib/devices/bsim4v5/b4v5mpar.c
+++ b/src/spicelib/devices/bsim4v5/b4v5mpar.c
@@ -200,14 +200,14 @@ GENmodel *inMod)
         case BSIM4v5_MOD_NSD:
             mod->BSIM4v5nsd = value->rValue;
             mod->BSIM4v5nsdGiven = TRUE;
-            if (mod->BSIM4v5nsd > 1.0e23)
+            if (mod->BSIM4v5nsd > 1.000001e24)
                 mod->BSIM4v5nsd *= 1.0e-6;
             break;
         case BSIM4v5_MOD_NGATE:
             mod->BSIM4v5ngate = value->rValue;
             mod->BSIM4v5ngateGiven = TRUE;
-	    if (mod->BSIM4v5ngate > 1.0e23)
-		mod->BSIM4v5ngate *= 1.0e-6;
+            if (mod->BSIM4v5ngate > 1.000001e24)
+                mod->BSIM4v5ngate *= 1.0e-6;
             break;
         case BSIM4v5_MOD_GAMMA1:
             mod->BSIM4v5gamma1 = value->rValue;
diff --git a/src/spicelib/devices/bsim4v6/b4v6mpar.c b/src/spicelib/devices/bsim4v6/b4v6mpar.c
index b1babc1f4..b2e57efa5 100644
--- a/src/spicelib/devices/bsim4v6/b4v6mpar.c
+++ b/src/spicelib/devices/bsim4v6/b4v6mpar.c
@@ -274,14 +274,14 @@ GENmodel *inMod)
         case BSIM4v6_MOD_NSD:
             mod->BSIM4v6nsd = value->rValue;
             mod->BSIM4v6nsdGiven = TRUE;
-            if (mod->BSIM4v6nsd > 1.0e23)
+            if (mod->BSIM4v6nsd > 1.000001e24)
                 mod->BSIM4v6nsd *= 1.0e-6;
             break;
         case BSIM4v6_MOD_NGATE:
             mod->BSIM4v6ngate = value->rValue;
             mod->BSIM4v6ngateGiven = TRUE;
-	    if (mod->BSIM4v6ngate > 1.0e23)
-		mod->BSIM4v6ngate *= 1.0e-6;
+            if (mod->BSIM4v6ngate > 1.000001e24)
+                mod->BSIM4v6ngate *= 1.0e-6;
             break;
         case BSIM4v6_MOD_GAMMA1:
             mod->BSIM4v6gamma1 = value->rValue;
diff --git a/src/spicelib/devices/bsim4v7/b4v7mpar.c b/src/spicelib/devices/bsim4v7/b4v7mpar.c
index 9d02f775d..1bc839751 100644
--- a/src/spicelib/devices/bsim4v7/b4v7mpar.c
+++ b/src/spicelib/devices/bsim4v7/b4v7mpar.c
@@ -283,13 +283,13 @@ GENmodel *inMod)
         case BSIM4v7_MOD_NSD:
             mod->BSIM4v7nsd = value->rValue;
             mod->BSIM4v7nsdGiven = TRUE;
-            if (mod->BSIM4v7nsd > 1.0e23)
+            if (mod->BSIM4v7nsd > 1.000001e24)
                 mod->BSIM4v7nsd *= 1.0e-6;
             break;
         case BSIM4v7_MOD_NGATE:
             mod->BSIM4v7ngate = value->rValue;
             mod->BSIM4v7ngateGiven = TRUE;
-            if (mod->BSIM4v7ngate > 1.0e23)
+            if (mod->BSIM4v7ngate > 1.000001e24)
                 mod->BSIM4v7ngate *= 1.0e-6;
             break;
         case BSIM4v7_MOD_GAMMA1: