1 files changed, 4 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 272d2f74f5..f634b6556d 100644
--- a/eval.c
+++ b/eval.c
@@ -7268,6 +7268,10 @@ mnew(klass, obj, id, mklass)
 	goto again;
     }
 
+    while (rklass != klass &&
+	   (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
+	rklass = RCLASS(rklass)->super;
+    }
     if (TYPE(klass) == T_ICLASS) klass = RBASIC(klass)->klass;
     method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
     data->klass = klass;