diff --git a/bus.cpp b/bus.cpp
index da96f68..446b244 100644
--- a/bus.cpp
+++ b/bus.cpp
@@ -345,6 +345,9 @@ uint32_t bus::calculate_physical_address(const int run_mode, const uint16_t a, c
 
 		m_offset += p_offset;
 
+		if ((MMR3 & 16) == 0)  // off is 18bit
+			m_offset &= 0x3ffff;
+
 		if (trap_on_failure) {
 			if ((MMR0 & (1 << 9)) || c->get_34()) {
 				const int access_control = pages[run_mode][0][apf].pdr & 7;
diff --git a/main.cpp b/main.cpp
index c5a13e8..24631da 100644
--- a/main.cpp
+++ b/main.cpp
@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
 	std::vector<std::string> rk05_files;
 	std::vector<std::string> rl02_files;
 
-	bool testCases    = false;
 	bool run_debugger = false;
 	bool tracing      = false;