diff --git a/vm_eval.c b/vm_eval.c
index 60c45e0805..af0a4884d3 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1168,11 +1168,16 @@ yield_under(VALUE under, VALUE self, VALUE values)
 	block.self = self;
 	th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
     }
-    cref = vm_cref_push(th, under, NOEX_PUBLIC, &block);
+    cref = vm_cref_push(th, under, NOEX_PUBLIC, blockptr);
     cref->flags |= NODE_FL_CREF_PUSHED_BY_EVAL;
 
     if (values == Qundef) {
+#if 0
+	/* The behavior of Ruby 1.8  */
 	return vm_yield_with_cref(th, 1, &self, cref);
+#else
+	return vm_yield_with_cref(th, 0, 0, cref);
+#endif
     }
     else {
 	return vm_yield_with_cref(th, RARRAY_LENINT(values), RARRAY_PTR(values), cref);