2 files changed, 2 insertions, 1 deletions
diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 5d23b2dd4..d647b4a55 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -619,6 +619,7 @@ gen_move(codegen_scope *s, uint16_t dst, uint16_t src, int nopeep)
         genop_2SS(s, data.insn, dst, i);
       }
       return;
+    case OP_AREF:
     case OP_GETUPVAR:
       if (data.a != src || data.a < s->nlocals) goto normal;
       rewind_pc(s);
diff --git a/src/vm.c b/src/vm.c
index 676e4d8bf..e675b594e 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1281,7 +1281,7 @@ RETRY_TRY_BLOCK:
     }
 
     CASE(OP_SETIDX, B) {
-      c = 1;
+      c = 2;
       mid = MRB_OPSYM(aset);
       goto L_SEND_SYM;
     }