diff --git a/vm_insnhelper.h b/vm_insnhelper.h
index 8e7b7c743e..6d32a7535b 100644
--- a/vm_insnhelper.h
+++ b/vm_insnhelper.h
@@ -144,7 +144,7 @@ CC_SET_FASTPATH(const struct rb_callcache *cc, vm_call_handler func, bool enable
     }
 }
 
-#define GET_BLOCK_HANDLER() VM_ENV_BLOCK_HANDLER(VM_EP_LEP(GET_EP()))
+#define GET_BLOCK_HANDLER() VM_CF_BLOCK_HANDLER(GET_CFP())
 
 /**********************************************************/
 /* deal with control flow 3: exception                    */