diff --git a/Intel8080/Intel8080.cs b/Intel8080/Intel8080.cs
index 1efafad..e973789 100644
--- a/Intel8080/Intel8080.cs
+++ b/Intel8080/Intel8080.cs
@@ -814,12 +814,10 @@ namespace EightBit
             this.MEMPTR.Low = this.BusRead(this.SP.Word);
             ++this.Bus.Address.Word;
             this.MEMPTR.High = this.BusRead();
-            this.Bus.Data = exchange.High;
-            this.BusWrite();
+            this.BusWrite(exchange.High);
             exchange.High = this.MEMPTR.High;
             --this.Bus.Address.Word;
-            this.Bus.Data = exchange.Low;
-            this.BusWrite();
+            this.BusWrite(exchange.Low);
             exchange.Low = this.MEMPTR.Low;
         }
 
diff --git a/Z80/Z80.cs b/Z80/Z80.cs
index aa23227..32775dc 100644
--- a/Z80/Z80.cs
+++ b/Z80/Z80.cs
@@ -1797,12 +1797,10 @@ namespace EightBit
             this.MEMPTR.Low = this.BusRead(this.SP.Word);
             ++this.Bus.Address.Word;
             this.MEMPTR.High = this.BusRead();
-            this.Bus.Data = exchange.High;
-            this.BusWrite();
+            this.BusWrite(exchange.High);
             exchange.High = this.MEMPTR.High;
             --this.Bus.Address.Word;
-            this.Bus.Data = exchange.Low;
-            this.BusWrite();
+            this.BusWrite(exchange.Low);
             exchange.Low = this.MEMPTR.Low;
         }