1 files changed, 5 insertions, 3 deletions
diff --git a/insns.def b/insns.def
index d616508b8c..b311199228 100644
--- a/insns.def
+++ b/insns.def
@@ -1251,9 +1251,8 @@ send
 		    }
 		}
 
-		/* dirty hack */
-		id    = (ID) ((VALUE *)(lcfp+1)->block_iseq)[0];
-		klass =      ((VALUE *)(lcfp+1)->block_iseq)[1];
+		id = lcfp->method_id;
+		klass = search_super_klass(lcfp->method_klass, recv);
 
 		if (TOPN(num) == Qfalse) {
 		    /* for ZSUPER */
@@ -1265,7 +1264,10 @@ send
 		    }
 		}
 	    }
+	    else {
 	    klass = search_super_klass(ip->klass, recv);
+	    }
+
 	    flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
 	    blockptr = tmp_blockptr;
 	    mn = rb_method_node(klass, id);