1 files changed, 14 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 3a684b484c..88ec197f96 100644
--- a/eval.c
+++ b/eval.c
@@ -556,14 +556,27 @@ dvar_asgn(id, value, push)
     struct RVarmap *vars = ruby_dyna_vars;
 
     while (vars) {
-	if (push && vars->id == 0) break;
+	if (push && vars->id == 0) {
+	    rb_dvar_push(id, value);
+	    return;
+	}
 	if (vars->id == id) {
 	    vars->val = value;
 	    return;
 	}
 	vars = vars->next;
     }
+
+    vars = 0;
+    if (ruby_dyna_vars && ruby_dyna_vars->id == 0) {
+	vars = ruby_dyna_vars;
+	ruby_dyna_vars = ruby_dyna_vars->next;
+    }
     rb_dvar_push(id, value);
+    if (vars) {
+	vars->next = ruby_dyna_vars;
+	ruby_dyna_vars = vars;
+    }
 }
 
 void