diff --git a/ChangeLog b/ChangeLog
index 1cf1b8987c..a1285dafe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 28 08:08:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_eval): problem to handle else part.  [ruby-dev:28873]
+
 Wed Jun 28 01:48:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_eval): support splat in when expression list.
diff --git a/eval.c b/eval.c
index e9775fa308..94f38ee99f 100644
--- a/eval.c
+++ b/eval.c
@@ -2846,7 +2846,6 @@ rb_eval(VALUE self, NODE *n)
 	goto again;
 
       case NODE_WHEN:
-	node = node->nd_body;
 	while (node) {
 	    if (nd_type(node) != NODE_WHEN) goto again;
 	    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node->nd_head, self,