diff --git a/src/frontend/com_measure2.c b/src/frontend/com_measure2.c
index e0518493b..b294a55ca 100644
--- a/src/frontend/com_measure2.c
+++ b/src/frontend/com_measure2.c
@@ -1232,7 +1232,7 @@ measure_parse_stdParams(
     /* dc: make m_from always less than m_to */
     if (cieq("dc", meas->m_analysis))
         if (meas->m_to < meas->m_from) {
-            SWAP(double, meas->m_to, meas->m_from);
+            SWAP(double, meas->m_from, meas->m_to);
         }
 
     return 1;
diff --git a/src/frontend/plotting/plotit.c b/src/frontend/plotting/plotit.c
index 2020cfe9d..756629323 100644
--- a/src/frontend/plotting/plotit.c
+++ b/src/frontend/plotting/plotit.c
@@ -830,10 +830,10 @@ plotit(wordlist *wl, char *hcopy, char *devname)
         ylims[1] = 1.0;
     }
     if (xlims[0] > xlims[1]) {
-        SWAP(double, xlims[1], xlims[0]);
+        SWAP(double, xlims[0], xlims[1]);
     }
     if (ylims[0] > ylims[1]) {
-        SWAP(double, ylims[1], ylims[0]);
+        SWAP(double, ylims[0], ylims[1]);
     }
     if (AlmostEqualUlps(xlims[0], xlims[1], 10)) {
         xlims[0] *= (xlims[0] > 0) ? 0.9 : 1.1;
diff --git a/src/maths/ni/niaciter.c b/src/maths/ni/niaciter.c
index 8f847ff49..fe4aec3da 100644
--- a/src/maths/ni/niaciter.c
+++ b/src/maths/ni/niaciter.c
@@ -76,9 +76,9 @@ retry:
     *ckt->CKTirhsSpare = 0;
     *ckt->CKTirhsOld = 0;
 
-    SWAP(double *, ckt->CKTirhsOld, ckt->CKTirhs);
+    SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);
 
-    SWAP(double *, ckt->CKTrhsOld, ckt->CKTrhs);
+    SWAP(double *, ckt->CKTrhs, ckt->CKTrhsOld);
 
     return(OK);
 }
diff --git a/src/maths/ni/niditer.c b/src/maths/ni/niditer.c
index a7a54d267..05611e7eb 100644
--- a/src/maths/ni/niditer.c
+++ b/src/maths/ni/niditer.c
@@ -76,8 +76,8 @@ skip:
     *ckt->CKTirhsSpare = 0;
     *ckt->CKTirhsOld = 0;
 
-    SWAP(double *, ckt->CKTirhsOld, ckt->CKTirhs);
+    SWAP(double *, ckt->CKTirhs, ckt->CKTirhsOld);
 
-    SWAP(double *, ckt->CKTrhsOld, ckt->CKTrhs);
+    SWAP(double *, ckt->CKTrhs, ckt->CKTrhsOld);
     return(OK);
 }
diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c
index d5b7be7f1..8aea29e5c 100644
--- a/src/maths/ni/niiter.c
+++ b/src/maths/ni/niiter.c
@@ -42,7 +42,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
 
 
     if( (ckt->CKTmode & MODETRANOP) && (ckt->CKTmode & MODEUIC)) {
-        SWAP(double *, ckt->CKTrhsOld, ckt->CKTrhs);
+        SWAP(double *, ckt->CKTrhs, ckt->CKTrhsOld);
         error = CKTload(ckt);
         if(error) {
             return(error);
@@ -266,7 +266,7 @@ NIiter(CKTcircuit *ckt, int maxIter)
         }
 
         /* build up the lvnim1 array from the lvn array */
-        SWAP(double *, ckt->CKTrhsOld, ckt->CKTrhs);
+        SWAP(double *, ckt->CKTrhs, ckt->CKTrhsOld);
         /*printf("after loading, after solving\n");*/
         /*CKTdump(ckt);*/
     }