diff --git a/ChangeLog b/ChangeLog
index 5202388d28..0f3a6339b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_obj_instance_eval): evaluates under special singleton
+	  classes as for special constants.
+
 Wed Aug 18 11:22:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (init_env): initialize HOME and USER environment
diff --git a/eval.c b/eval.c
index 366af113e7..bc17cb68de 100644
--- a/eval.c
+++ b/eval.c
@@ -6380,14 +6380,7 @@ rb_obj_instance_eval(argc, argv, self)
     VALUE *argv;
     VALUE self;
 {
-    VALUE klass;
-
-    if (rb_special_const_p(self)) {
-	klass = Qnil;
-    }
-    else {
-	klass = rb_singleton_class(self);
-    }
+    VALUE klass = rb_singleton_class(self);
 
     return specific_eval(argc, argv, klass, self);
 }