1 files changed, 3 insertions, 2 deletions
diff --git a/variable.c b/variable.c
index 71f8585def..70cd46e1ce 100644
--- a/variable.c
+++ b/variable.c
@@ -598,7 +598,9 @@ remove_trace(entry)
 	    trace->next = next->next;
 	    free(next);
 	}
-	trace = next;
+	else {
+	    trace = next;
+	}
     }
     entry->trace = t.next;
 }
@@ -629,7 +631,6 @@ rb_f_untrace_var(argc, argv)
 	    trace->removed = 1;
 	    trace = next;
 	}
-	entry->trace = 0;
 
 	if (!entry->block_trace) remove_trace(entry);
 	return ary;