diff --git a/bus.cpp b/bus.cpp
index f44d9db..26ef7e6 100644
--- a/bus.cpp
+++ b/bus.cpp
@@ -935,9 +935,9 @@ uint16_t bus::peekWord(const uint16_t a)
 	return read(a, false, false, true);
 }
 
-void bus::writeWord(const uint16_t a, const uint16_t value)
+void bus::writeWord(const uint16_t a, const uint16_t value, const d_i_space_t s)
 {
-	write(a, false, value, false);
+	write(a, false, value, false, s);
 }
 
 uint16_t bus::readUnibusByte(const uint16_t a)
diff --git a/bus.h b/bus.h
index 585ce8d..4ceb64e 100644
--- a/bus.h
+++ b/bus.h
@@ -134,7 +134,7 @@ public:
 
 	void write(const uint16_t a, const bool word_mode, uint16_t value, const bool use_prev, const d_i_space_t s = i_space);
 	void writeByte(const uint16_t a, const uint8_t value) { return write(a, true, value, false); }
-	void writeWord(const uint16_t a, const uint16_t value);
+	void writeWord(const uint16_t a, const uint16_t value, const d_i_space_t s = i_space);
 
 	uint16_t readPhysical(const uint32_t a);
 	void writePhysical(const uint32_t a, const uint16_t value);
diff --git a/cpu.cpp b/cpu.cpp
index 3150d03..c739eef 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -1473,14 +1473,14 @@ void cpu::pushStack(const uint16_t v)
 	else {
 		uint16_t a = addRegister(6, false, -2);
 
-		b->writeWord(a, v);
+		b->writeWord(a, v, d_space);
 	}
 }
 
 uint16_t cpu::popStack()
 {
 	uint16_t a    = getRegister(6);
-	uint16_t temp = b->readWord(a);
+	uint16_t temp = b->readWord(a, d_space);
 
 	addRegister(6, false, 2);