1 files changed, 6 insertions, 4 deletions

diff --git a/proc.c b/proc.c
index 07c43dfe00..47c565134a 100644
--- a/proc.c
+++ b/proc.c
@@ -313,19 +313,21 @@ binding_clone(VALUE self)
 VALUE
 rb_binding_new_with_cfp(rb_thread_t *th, const rb_control_frame_t *src_cfp)
 {
-    rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, 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;
     rb_binding_t *bind;
 
-    if (cfp == 0) {
+    if (cfp == 0 || ruby_level_cfp == 0) {
 	rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber.");
     }
 
     bindval = binding_alloc(rb_cBinding);
     GetBindingPtr(bindval, bind);
     bind->env = rb_vm_make_env_object(th, cfp);
-    bind->path = cfp->iseq->location.path;
-    bind->first_lineno = rb_vm_get_sourceline(cfp);
+    bind->path = ruby_level_cfp->iseq->location.path;
+    bind->first_lineno = rb_vm_get_sourceline(ruby_level_cfp);
+
     return bindval;
 }