diff --git a/M6502/M6502.cs b/M6502/M6502.cs
index e398aba..31dc912 100644
--- a/M6502/M6502.cs
+++ b/M6502/M6502.cs
@@ -219,7 +219,9 @@ namespace EightBit
 
         private void Jam()
         {
-            this.Bus.Address.Word = this.PC.Word--;
+            this.Bus.Address.Low = this.PC.Low;
+            this.Bus.Address.High = this.PC.High;
+            --this.PC.Word;
             this.MemoryRead();
             this.MemoryRead();
         }
diff --git a/Z80/Z80.cs b/Z80/Z80.cs
index b962cbd..418c96c 100644
--- a/Z80/Z80.cs
+++ b/Z80/Z80.cs
@@ -2125,7 +2125,8 @@ namespace EightBit
 
         private void RRD()
         {
-            this.MEMPTR.Word = this.Bus.Address.Word = this.HL.Word;
+            this.MEMPTR.Low = this.Bus.Address.Low = this.HL.Low;
+            this.MEMPTR.High = this.Bus.Address.High = this.HL.High;
             ++this.MEMPTR.Word;
             var memory = this.MemoryRead();
             this.Tick(4);
@@ -2137,7 +2138,8 @@ namespace EightBit
 
         private void RLD()
         {
-            this.MEMPTR.Word = this.Bus.Address.Word = this.HL.Word;
+            this.MEMPTR.Low = this.Bus.Address.Low = this.HL.Low;
+            this.MEMPTR.High = this.Bus.Address.High = this.HL.High;
             ++this.MEMPTR.Word;
             var memory = this.MemoryRead();
             this.Tick(4);