diff --git a/ChangeLog b/ChangeLog
index e296dea3d2..3c22cbebbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Feb 13 15:11:11 2009  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (eval_string_with_cref): use rb_vm_get_ruby_level_next_cfp() 
+	  instead of vm_get_ruby_level_caller_cfp().  checking a upper frame
+	  is not enough.  [ruby-dev:37984]
+
+	* proc.c, vm_core.h: declare rb_vm_get_ruby_level_next_cfp()
+	  on vm_core.h.
+
 Fri Feb 13 15:01:40 2009  Koichi Sasada  <ko1@atdot.net>
 
 	* cont.c (rb_fiber_alive_p): fix to return true instead of 1.
diff --git a/proc.c b/proc.c
index dea1a0e103..2761158815 100644
--- a/proc.c
+++ b/proc.c
@@ -274,8 +274,6 @@ binding_clone(VALUE self)
     return bindval;
 }
 
-rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
-
 VALUE
 rb_binding_new(void)
 {
diff --git a/vm_core.h b/vm_core.h
index 4d6ddcc64f..dd5f3400db 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -593,6 +593,7 @@ int ruby_thread_has_gvl_p(void);
 VALUE rb_make_backtrace(void);
 typedef int rb_backtrace_iter_func(void *, const char *, int, const char *);
 VALUE rb_backtrace_each(rb_backtrace_iter_func *iter, void *arg);
+rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
 
 NOINLINE(void rb_gc_save_machine_context(rb_thread_t *));
 
diff --git a/vm_eval.c b/vm_eval.c
index ed0e34a6cd..b43e88d372 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -706,7 +706,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
 	    th->base_block = &env->block;
 	}
 	else {
-	    rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp);
+	    rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
 
 	    if (cfp != 0) {
 		block = *RUBY_VM_GET_BLOCK_PTR_IN_CFP(cfp);