1 files changed, 8 insertions, 5 deletions
diff --git a/proc.c b/proc.c
index 516007c66d..2f6760315c 100644
--- a/proc.c
+++ b/proc.c
@@ -992,10 +992,6 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
 	goto again;
     }
 
-    if (RB_TYPE_P(defined_class, T_ICLASS)) {
-	defined_class = RBASIC(defined_class)->klass;
-    }
-
     klass = defined_class;
 
     while (rclass != klass &&
@@ -1173,9 +1169,16 @@ static VALUE
 method_owner(VALUE obj)
 {
     struct METHOD *data;
+    VALUE defined_class;
 
     TypedData_Get_Struct(obj, struct METHOD, &method_data_type, data);
-    return data->defined_class;
+    defined_class = data->defined_class;
+
+    if (RB_TYPE_P(defined_class, T_ICLASS)) {
+	defined_class = RBASIC(defined_class)->klass;
+    }
+
+    return defined_class;
 }
 
 void