diff --git a/ChangeLog b/ChangeLog
index 0205c6cb29..d21a476dd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 31 16:59:25 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (exec_under): should initialize ruby_frame->self;
+
 Wed Oct 31 15:09:28 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old
diff --git a/eval.c b/eval.c
index bea650cc56..90f17e5be4 100644
--- a/eval.c
+++ b/eval.c
@@ -5098,6 +5098,7 @@ exec_under(func, under, args)
     PUSH_CLASS();
     ruby_class = under;
     PUSH_FRAME();
+    ruby_frame->self = _frame.prev->self;
     ruby_frame->last_func = _frame.prev->last_func;
     ruby_frame->last_class = _frame.prev->last_class;
     ruby_frame->argc = _frame.prev->argc;