1 files changed, 10 insertions, 2 deletions

diff --git a/proc.c b/proc.c
index bc47359e8e..ad53982b16 100644
--- a/proc.c
+++ b/proc.c
@@ -315,16 +315,24 @@ rb_binding_new_with_cfp(rb_thread_t *th, const rb_control_frame_t *src_cfp)
 {
     rb_control_frame_t *cfp = rb_vm_get_binding_creatable_next_cfp(th, src_cfp);
     rb_control_frame_t *ruby_level_cfp = rb_vm_get_ruby_level_next_cfp(th, src_cfp);
-    VALUE bindval;
+    VALUE bindval, envval;
     rb_binding_t *bind;
 
     if (cfp == 0 || ruby_level_cfp == 0) {
 	rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber.");
     }
 
+    while (1) {
+	envval = rb_vm_make_env_object(th, cfp);
+	if (cfp == ruby_level_cfp) {
+	    break;
+	}
+	cfp = rb_vm_get_binding_creatable_next_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
+    }
+
     bindval = binding_alloc(rb_cBinding);
     GetBindingPtr(bindval, bind);
-    bind->env = rb_vm_make_env_object(th, cfp);
+    bind->env = envval;
     bind->path = ruby_level_cfp->iseq->location.path;
     bind->first_lineno = rb_vm_get_sourceline(ruby_level_cfp);