1 files changed, 1 insertions, 1 deletions
diff --git a/class.c b/class.c
index 15f060d4e9..60b64ac884 100644
--- a/class.c
+++ b/class.c
@@ -643,7 +643,7 @@ rb_singleton_class(obj)
 	klass = RBASIC(obj)->klass;
     }
     else {
-	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
+	klass = rb_make_metaclass(obj, CLASS_OF(obj));
     }
     if (OBJ_TAINTED(obj)) {
 	OBJ_TAINT(klass);