diff --git a/src/frontend/inp.c b/src/frontend/inp.c
index 340419044..40e240927 100644
--- a/src/frontend/inp.c
+++ b/src/frontend/inp.c
@@ -1839,11 +1839,11 @@ set_tlist(struct circ *curckt)
 
 /* remove the actual modtlist and devtlist */
 void
-rem_tlist(void)
+rem_tlist(struct circ *circ)
 {
     struct pt_temper *p;
 
-    for (p = devtlist; p;) {
+    for (p = circ->devtlist; p;) {
         struct pt_temper *next_p = p->next;
         tfree(p->expression);
         wl_free(p->wl);
@@ -1851,7 +1851,7 @@ rem_tlist(void)
         tfree(p);
         p = next_p;
     }
-    for (p = modtlist; p;) {
+    for (p = circ->modtlist; p;) {
         struct pt_temper *next_p = p->next;
         tfree(p->expression);
         wl_free(p->wl);
diff --git a/src/frontend/runcoms2.c b/src/frontend/runcoms2.c
index 756a85a94..eebc65cd6 100644
--- a/src/frontend/runcoms2.c
+++ b/src/frontend/runcoms2.c
@@ -259,7 +259,7 @@ com_remcirc(wordlist *wl)
         tfree(ft_curckt->ci_name);
     if (ft_curckt->ci_filename)
         tfree(ft_curckt->ci_filename);
-    rem_tlist();
+    rem_tlist(ft_curckt);
 
     /* delete the actual circuit entry from ft_circuits */
     for (p = ft_circuits; p; p = p->ci_next) {
diff --git a/src/include/ngspice/fteext.h b/src/include/ngspice/fteext.h
index a885c7d3c..1e84cd413 100644
--- a/src/include/ngspice/fteext.h
+++ b/src/include/ngspice/fteext.h
@@ -222,7 +222,7 @@ void eval_seed_opt(struct line *deck);
 
 extern char** circarray;
 extern void set_tlist(struct circ *curckt);
-extern void rem_tlist(void);
+extern void rem_tlist(struct circ *curckt);
 
 /* nutinp.c */