diff --git a/src/frontend/inp.c b/src/frontend/inp.c
index 4879fe6f8..340419044 100644
--- a/src/frontend/inp.c
+++ b/src/frontend/inp.c
@@ -820,12 +820,10 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
             fclose(fdo);
         }
 
-        if (expr_w_temper) {
-            /* Now the circuit is defined, so generate the parse trees */
-            inp_parse_temper_trees();
-            /* Get the actual data for model and device instance parameters */
-            inp_evaluate_temper();
-        }
+        /* Now the circuit is defined, so generate the parse trees */
+        inp_parse_temper_trees();
+        /* Get the actual data for model and device instance parameters */
+        inp_evaluate_temper();
 
        /* linked list dbs is used to store the "save" or .save data (defined in breakp2.c),
           (When controls are executed later on, also stores TRACE, IPLOT, and STOP data) */
@@ -1837,7 +1835,6 @@ set_tlist(struct circ *curckt)
 {
     modtlist = curckt->modtlist;
     devtlist = curckt->devtlist;
-    expr_w_temper = (modtlist || devtlist);
 }
 
 /* remove the actual modtlist and devtlist */
diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c
index 77dddf432..145162495 100644
--- a/src/spicelib/analysis/cktdojob.c
+++ b/src/spicelib/analysis/cktdojob.c
@@ -114,8 +114,7 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
 
     /* call altermod and alter on device and model parameters assembled in
        devtlist and modtlist (if using temper) because we have a new temperature */
-    if (expr_w_temper)
-        inp_evaluate_temper();
+    inp_evaluate_temper();
 
     error = 0;
 
diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c
index 75f2bf9f9..98a0a5e41 100644
--- a/src/spicelib/analysis/dctrcurv.c
+++ b/src/spicelib/analysis/dctrcurv.c
@@ -143,8 +143,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
             job->TRCVvSave[i] = ckt->CKTtemp; /* Saves the old circuit temperature */
             job->TRCVvType[i] = TEMP_CODE;    /* Set the sweep type code */
             ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK; /* Set the new circuit temp */
-            if (expr_w_temper)
-                inp_evaluate_temper();
+            inp_evaluate_temper();
             CKTtemp(ckt);
             goto found;
         }
@@ -276,8 +275,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
                     job->TRCVvStart[i];
             } else if (job->TRCVvType[i] == TEMP_CODE) {
                 ckt->CKTtemp = job->TRCVvStart[i] + CONSTCtoK;
-                if (expr_w_temper)
-                    inp_evaluate_temper();
+                inp_evaluate_temper();
                 CKTtemp(ckt);
             } else if (job->TRCVvType[i] == rcode) {
                 ((RESinstance *)(job->TRCVvElt[i]))->RESresist =
@@ -470,8 +468,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
             DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt);
         } else if (job->TRCVvType[i] == TEMP_CODE) { /* temperature */
             ckt->CKTtemp += job->TRCVvStep[i];
-            if (expr_w_temper)
-                inp_evaluate_temper();
+            inp_evaluate_temper();
             CKTtemp(ckt);
         }
 
@@ -508,8 +505,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
             DEVices[rcode]->DEVload(job->TRCVvElt[i]->GENmodPtr, ckt);
         } else if (job->TRCVvType[i] == TEMP_CODE) {
             ckt->CKTtemp = job->TRCVvSave[i];
-            if (expr_w_temper)
-                inp_evaluate_temper();
+            inp_evaluate_temper();
             CKTtemp(ckt);
         }