2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6db0671740..c59803f1f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  8 00:40:52 2005  Yukihiro Matsumoto  <[email protected]>
+
+	* eval.c (call_trace_func): klass parameter should be a
+	  class/module that defines calling method.  [ruby-talk:169307]
+
 Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <[email protected]>
 
 	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
diff --git a/eval.c b/eval.c
index 7465314191..ceb95e4d21 100644
--- a/eval.c
+++ b/eval.c
@@ -2628,7 +2628,7 @@ call_trace_func(event, node, self, id, klass)
 	    klass = RBASIC(klass)->klass;
 	}
 	else if (FL_TEST(klass, FL_SINGLETON)) {
-	    klass = self;
+	    klass = rb_iv_get(klass, "__attached__");
 	}
     }
     PUSH_TAG(PROT_NONE);