1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm.c b/src/vm.c
index 47ad9a9cc..8b14566c1 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -118,16 +118,16 @@ static inline void
 envadjust(mrb_state *mrb, mrb_value *oldbase, mrb_value *newbase)
 {
   mrb_callinfo *ci = mrb->c->cibase;
-  ptrdiff_t off;
 
   if (newbase == oldbase) return;
-  off = newbase - oldbase;
   while (ci <= mrb->c->ci) {
     struct REnv *e = ci->env;
     if (e && MRB_ENV_STACK_SHARED_P(e)) {
-      e->stack += off;
+      ptrdiff_t off = e->stack - oldbase;
+
+      e->stack = newbase + off;
     }
-    ci->stackent += off;
+    ci->stackent = newbase + (ci->stackent - oldbase);
     ci++;
   }
 }