1 files changed, 10 insertions, 5 deletions

diff --git a/vm_eval.c b/vm_eval.c
index ace21b0468..807d560741 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -194,14 +194,19 @@ vm_call0_body(rb_thread_t* th, struct rb_calling_info *calling, const struct rb_
       case VM_METHOD_TYPE_REFINED:
 	{
 	    const rb_method_type_t type = cc->me->def->type;
-	    VALUE super_class;
+	    VALUE super_class = cc->me->defined_class;
 
-	    if (type == VM_METHOD_TYPE_REFINED && cc->me->def->body.refined.orig_me) {
-		cc->me = refined_method_callable_without_refinement(cc->me);
-		goto again;
+	    if (type == VM_METHOD_TYPE_REFINED) {
+		if (cc->me->def->body.refined.orig_me) {
+		    cc->me = refined_method_callable_without_refinement(cc->me);
+		    goto again;
+		}
+	    }
+	    else {
+		super_class = RCLASS_ORIGIN(super_class);
 	    }
 
-	    super_class = RCLASS_SUPER(RCLASS_ORIGIN(cc->me->defined_class));
+	    super_class = RCLASS_SUPER(super_class);
 
 	    if (!super_class || !(cc->me = rb_callable_method_entry(super_class, ci->mid))) {
 		enum method_missing_reason ex = (type == VM_METHOD_TYPE_ZSUPER) ? MISSING_SUPER : 0;