diff --git a/src/bytecode.h b/src/bytecode.h
index 673e6f1..08b99d5 100644
--- a/src/bytecode.h
+++ b/src/bytecode.h
@@ -48,8 +48,8 @@ enum bytecode {
 
   BC_ZERO, /*  optimization bytecode, shortcut for the sequence [-]  */
 
-  BC_MOVE_VALUE, /*  cell[current] += cell[current + payload[0]]
-                  *  cell[current + payload[0]] = 0  */
+  BC_MOVE_VALUE, /*  cell[current + payload[0]] += cell[current]
+                  *  cell[current] = 0  */
 
   BC_NUM_BYTECODES
 };
diff --git a/src/compiler.c b/src/compiler.c
index 005d4d0..83f5b92 100644
--- a/src/compiler.c
+++ b/src/compiler.c
@@ -34,7 +34,7 @@ static void ensure_space(program_t *program, size_t size) {
     program->codepages = new_page;
 
     program->begin = (intptr_t) new_page->page;
-    program->limit = (intptr_t) program + size;
+    program->limit = (intptr_t) program->begin + size;
   }
 }