1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/macros.tab b/erts/emulator/beam/macros.tab
index 35460da1f4..debeafa651 100644
--- a/erts/emulator/beam/macros.tab
+++ b/erts/emulator/beam/macros.tab
@@ -29,17 +29,17 @@ REFRESH_GEN_DEST() {
 }
 
 SET_I_REL(Offset) {
-    ASSERT(VALID_INSTR(* (Eterm *)((BeamInstr *) ($Offset))));
-    I = (BeamInstr *) $Offset;
+    ASSERT(VALID_INSTR(*(I + ($Offset))));
+    I += $Offset;
 }
 
 SET_CP_I_ABS(Target) {
     c_p->i = $Target;
-    ASSERT(VALID_INSTR(* (Eterm *)c_p->i));
+    ASSERT(VALID_INSTR(*c_p->i));
 }
 
 SET_REL_I(Dst, Offset) {
-    $Dst = (BeamInstr *) ($Offset);
+    $Dst = I + ($Offset);
     ASSERT(VALID_INSTR(*$Dst));
 }