1 files changed, 5 insertions, 2 deletions
diff --git a/src/vm.c b/src/vm.c
index efea22d4a..e187d162c 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -544,8 +544,11 @@ static void
 check_method_noarg(mrb_state *mrb, const mrb_callinfo *ci)
 {
   int argc = ci->n == CALL_MAXARGS ? RARRAY_LEN(ci->stack[1]) : ci->n;
-  if (ci->nk != 0 && !mrb_hash_empty_p(mrb, ci->stack[ci->n == CALL_MAXARGS ? 2 : ci->n + 1])) {
-    argc++;
+  if (ci->nk > 0) {
+    mrb_value kdict = ci->stack[mrb_ci_kidx(ci)];
+    if (!(mrb_hash_p(kdict) && mrb_hash_empty_p(mrb, kdict))) {
+      argc++;
+    }
   }
   if (argc > 0) {
     mrb_argnum_error(mrb, argc, 0, 0);