diff --git a/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift b/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift
index f333a589e..c9a1db43c 100644
--- a/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift	
+++ b/OSBindings/Mac/Clock SignalTests/KlausDormannTests.swift	
@@ -47,6 +47,7 @@ class KlausDormannTests: XCTestCase {
 					if newPC == oldPC {
 						let error = errorForTrapAddress(oldPC)
 						XCTAssert(error == nil, "Failed with error \(error)")
+						return
 					}
 				}
 			}
diff --git a/Processors/6502/CPU6502AllRAM.cpp b/Processors/6502/CPU6502AllRAM.cpp
index 2b8805973..697a4b87f 100644
--- a/Processors/6502/CPU6502AllRAM.cpp
+++ b/Processors/6502/CPU6502AllRAM.cpp
@@ -12,11 +12,13 @@
 
 using namespace CPU6502;
 
-AllRAMProcessor::AllRAMProcessor() : _timestamp(0) {}
+AllRAMProcessor::AllRAMProcessor() : _timestamp(0)
+{
+	set_power_on(false);
+}
 
 int AllRAMProcessor::perform_bus_operation(CPU6502::BusOperation operation, uint16_t address, uint8_t *value)
 {
-	set_power_on(false);
 	_timestamp++;
 
 	if(isReadOperation(operation)) {