1 files changed, 2 insertions, 3 deletions
diff --git a/src/kernel.c b/src/kernel.c
index b98e52c42..36ed0c121 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -176,8 +176,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
     if (bidx < 0) return mrb_false_value();
     bp = &e->stack[bidx];
   }
-  else if (ci->env) {
-    e = ci->env;
+  else if ((e = mrb_vm_ci_env(ci)) != NULL) {
     /* top-level does not have block slot (always false) */
     if (e->stack == mrb->c->stbase) return mrb_false_value();
     bidx = env_bidx(e);
@@ -186,7 +185,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self)
     bp = &e->stack[bidx];
   }
   else {
-    bp = ci[1].stackent+1;
+    bp = ci->stack+1;
     if (ci->argc >= 0) {
       bp += ci->argc;
     }