1 files changed, 2 insertions, 0 deletions
diff --git a/src/vm.c b/src/vm.c
index 486c21ee3..2901f89d9 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -109,6 +109,7 @@ stack_init(mrb_state *mrb)
   c->ciend = c->cibase + CALLINFO_INIT_SIZE;
   c->ci = c->cibase;
   c->ci->target_class = mrb->object_class;
+  c->ci->stackent = c->stack;
 }
 
 static inline void
@@ -116,6 +117,7 @@ envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
 {
   mrb_callinfo *ci = mrb->c->cibase;
 
+  if (newbase == oldbase) return;
   while (ci <= mrb->c->ci) {
     struct REnv *e = ci->env;
     if (e && e->cioff >= 0) {