diff --git a/src/frame.h b/src/frame.h
index 69fafc7e..c92ad212 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -179,8 +179,6 @@ _frame_from_code_raddr(py_proc_t * py_proc, void * code_raddr, int lasti, python
       return NULL;
     }
 
-    lasti >>= 1;
-
     for (size_t i = 0, bc = 0; i < len; i++) {
       bc += (lnotab[i] & 7) + 1;
       int code = (lnotab[i] >> 3) & 15;
diff --git a/src/py_thread.c b/src/py_thread.c
index 045ffebd..a542ef16 100644
--- a/src/py_thread.c
+++ b/src/py_thread.c
@@ -314,7 +314,7 @@ _py_thread__push_iframe_from_addr(py_thread_t * self, PyInterpreterFrame * ifram
   stack_py_push(
     origin,
     code_raddr,
-    ((int)(V_FIELD_PTR(void *, iframe, py_iframe, o_prev_instr) - code_raddr)) - py_v->py_code.o_code
+    (((int)(V_FIELD_PTR(void *, iframe, py_iframe, o_prev_instr) - code_raddr)) - py_v->py_code.o_code) / sizeof(_Py_CODEUNIT)
   );
 
   #ifdef NATIVE