diff --git a/src/codegen/codegen_ops_mov.h b/src/codegen/codegen_ops_mov.h
index 6a5054b81..eb2a0202c 100644
--- a/src/codegen/codegen_ops_mov.h
+++ b/src/codegen/codegen_ops_mov.h
@@ -600,12 +600,12 @@ ropMOV_seg_w(UNUSED(uint8_t opcode), uint32_t fetchdat, uint32_t op_32, uint32_t
             MEM_LOAD_ADDR_EA_L(target_seg);                                                                          \
             STORE_HOST_REG_ADDR((uintptr_t) &codegen_temp, 0);                                                       \
             LOAD_EA();                                                                                               \
-            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 4);                                                                \
+            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 4, op_32);                                                         \
         } else {                                                                                                     \
             MEM_LOAD_ADDR_EA_W(target_seg);                                                                          \
             STORE_HOST_REG_ADDR_W((uintptr_t) &codegen_temp, 0);                                                     \
             LOAD_EA();                                                                                               \
-            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 2);                                                                \
+            MEM_LOAD_ADDR_EA_W_OFFSET(target_seg, 2, op_32);                                                         \
         }                                                                                                            \
         LOAD_SEG(0, &rseg);                                                                                          \
         if (op_32 & 0x100) {                                                                                         \
diff --git a/src/codegen/codegen_ops_x86-64.h b/src/codegen/codegen_ops_x86-64.h
index 1d9b29de2..129d9a740 100644
--- a/src/codegen/codegen_ops_x86-64.h
+++ b/src/codegen/codegen_ops_x86-64.h
@@ -1049,7 +1049,7 @@ MEM_LOAD_ADDR_EA_W(x86seg *seg)
     /*done:*/
 }
 static __inline void
-MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset)
+MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset, int op_32)
 {
     addbyte(0x83); /*ADD EAX, offset*/
     addbyte(0xc0);
diff --git a/src/codegen/codegen_ops_x86.h b/src/codegen/codegen_ops_x86.h
index 5e7165939..3fbefdeaa 100644
--- a/src/codegen/codegen_ops_x86.h
+++ b/src/codegen/codegen_ops_x86.h
@@ -789,7 +789,7 @@ MEM_LOAD_ADDR_EA_W(x86seg *seg)
     host_reg_mapping[0] = 8;
 }
 static __inline void
-MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset)
+MEM_LOAD_ADDR_EA_W_OFFSET(x86seg *seg, int offset, int op_32)
 {
     if ((seg == &cpu_state.seg_ds && codegen_flat_ds && !(cpu_cur_status & CPU_STATUS_NOTFLATDS)) || (seg == &cpu_state.seg_ss && codegen_flat_ss && !(cpu_cur_status & CPU_STATUS_NOTFLATSS))) {
         addbyte(0x31); /*XOR EDX, EDX*/