diff --git a/src/808x.c b/src/808x.c
index 3d94ed733..7c586822f 100644
--- a/src/808x.c
+++ b/src/808x.c
@@ -391,7 +391,7 @@ static void fetcheal()
                 easeg=*mod1seg[rm];
                 eaaddr&=0xFFFF;
         }
-	last_ea = eaaddr;
+	cpu_state.last_ea = eaaddr;
 }
 
 static inline uint8_t geteab()
diff --git a/src/x86_ops_mov.h b/src/x86_ops_mov.h
index f82004930..0499ed315 100644
--- a/src/x86_ops_mov.h
+++ b/src/x86_ops_mov.h
@@ -366,7 +366,7 @@ static int opXLAT_a16(uint32_t fetchdat)
 {
         uint32_t addr = (BX + AL)&0xFFFF;
         uint8_t temp;
-	last_ea = addr;
+	cpu_state.last_ea = addr;
         temp = readmemb(ea_seg->base, addr);
         if (abrt) return 1;
         AL = temp;
@@ -377,7 +377,7 @@ static int opXLAT_a32(uint32_t fetchdat)
 {
         uint32_t addr = EBX + AL;
         uint8_t temp;
-	last_ea = addr;
+	cpu_state.last_ea = addr;
         temp = readmemb(ea_seg->base, addr);
         if (abrt) return 1;
         AL = temp;