diff --git a/src/maths/ni/niconv.c b/src/maths/ni/niconv.c
index 30dbcf31a..a17b625fe 100644
--- a/src/maths/ni/niconv.c
+++ b/src/maths/ni/niconv.c
@@ -111,7 +111,7 @@ NIconvTest (CKTcircuit *ckt)
 
                 return 1 ;
             }
-        } else {
+        } else if ((node->type == SP_CURRENT) && (!ckt->CKTnodeIsLinear [i])) {
             new = ckt->CKTrhs [i] ;
             old = ckt->CKTrhsOld [i] ;
             tol = ckt->CKTreltol * (MAX (fabs (old), fabs (new))) + ckt->CKTabstol ;
diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c
index 90549af90..ea8cb0491 100644
--- a/src/spicelib/analysis/cktop.c
+++ b/src/spicelib/analysis/cktop.c
@@ -228,7 +228,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode,
         }
     }
 
-    ckt->CKTdiagGmin = ckt->CKTgshunt;
+//    ckt->CKTdiagGmin = ckt->CKTgshunt;
     FREE (OldRhsOld);
     FREE (OldCKTstate0);