diff --git a/ChangeLog b/ChangeLog
index 77f560e98e..f0d72be0c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  7 15:28:03 2002  Minero Aoki  <aamine@loveruby.net>
+
+	* eval.c (rb_yield_0): The destination of the goto jump was wrong.
+
 Tue May  7 09:17:51 2002  Minero Aoki  <aamine@loveruby.net>
 
 	* eval.c (superclass): undesirable "unexpected return" when the
diff --git a/eval.c b/eval.c
index 77d2f571d8..7916556273 100644
--- a/eval.c
+++ b/eval.c
@@ -3797,8 +3797,8 @@ rb_yield_0(val, self, klass, pcall)
 	}
     }
     POP_TAG();
-  pop_state:
     POP_ITER();
+  pop_state:
     POP_CLASS();
     if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
 	!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {