diff --git a/cpuops.cpp b/cpuops.cpp
index 63121704..dbf4051f 100644
--- a/cpuops.cpp
+++ b/cpuops.cpp
@@ -1635,11 +1635,12 @@ static void OpF8 (void)
 // CLI
 static void Op58 (void)
 {
-//	ClearIRQ();
 	AddCycles(ONE_CYCLE);
 
 #ifndef SA1_OPCODES
 	Timings.IRQFlagChanging = IRQ_CLEAR_FLAG;
+#else
+	ClearIRQ();
 #endif
 }
 
@@ -1650,6 +1651,8 @@ static void Op78 (void)
 
 #ifndef SA1_OPCODES
 	Timings.IRQFlagChanging = IRQ_SET_FLAG;
+#else
+	SetIRQ();
 #endif
 }