1 files changed, 3 insertions, 2 deletions

diff --git a/src/bytecode/vm.h b/src/bytecode/vm.h
index a02bdd1..0d1595d 100755
--- a/src/bytecode/vm.h
+++ b/src/bytecode/vm.h
@@ -193,6 +193,7 @@ vm_interpret(VM *vm) {
                 // of it that lives on the heap.
                 Object proc = array_pop(vm->stack);
                 proc = make_lambda(proc.closure->chunk);
+
                 ssize_t n_captured = AS_FIXNUM(array_pop(vm->stack));
                 for (ssize_t i = 0; i < n_captured; i++) {
                     Object value = array_pop(vm->stack);
@@ -303,7 +304,7 @@ vm_interpret(VM *vm) {
             } break;
             case OP_CALL: {
                 ssize_t n_args = AS_FIXNUM(array_pop(vm->stack));
-                Object proc = array_pop(vm->stack);
+                Object proc = vm->stack[array_size(vm->stack) - 1 - n_args];
 
                 // Check the number of arguments is correct.
                 // NOTE: This is probably better handled at compilation, but for
@@ -363,7 +364,7 @@ vm_interpret(VM *vm) {
                 vm->pc = frame->rp;
                 array_head(vm->frames)->size--;
                 Object ret = array_pop(vm->stack);
-                array_head(vm->stack)->size = frame->stack_offset;
+                array_head(vm->stack)->size = frame->stack_offset - 1;
                 array_push(vm->stack, ret);
                 frame = &vm->frames[array_size(vm->frames) - 1];
                 chunk = frame->closure->chunk;