diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm
index b1939e76d..2c3425337 100644
--- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
@@ -85,7 +85,7 @@ struct TestExecutor {
 /// Binds a bus-accurate 68000 to 16mb of RAM.
 struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 	uint8_t *const ram;
-	CPU::MC68000Mk2::Processor<TestProcessor, true, false, true> processor;
+	CPU::MC68000Mk2::Processor<TestProcessor, true, true, true> processor;
 	std::function<void(void)> comparitor;
 
 	TestProcessor(uint8_t *ram) : ram(ram), processor(*this) {}
@@ -156,7 +156,7 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 
 	// To limit tests run to a subset of files and/or of tests, uncomment and fill in below.
 	_fileSet = [NSSet setWithArray:@[
-		@"btst_bchg_bclr_bset.json",
+//		@"chk.json",
 
 		// Below this line are passing tests.
 		@"abcd_sbcd.json",
@@ -165,6 +165,7 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 		@"addq_subq.json",
 		@"addx_subx.json",
 		@"bcc.json",
+		@"btst_bchg_bclr_bset.json",
 		@"cmp.json",
 		@"dbcc_scc.json",
 		@"eor_and_or.json",
@@ -173,8 +174,8 @@ struct TestProcessor: public CPU::MC68000Mk2::BusHandler {
 		@"nbcd.json",
 		@"ext.json",
 		@"swap.json",
-	]];		// 14/32 = ~44 % done, as far as the tests go.
-//	_testSet = [NSSet setWithArray:@[@"ADDQ 05df"]];
+	]];		// 15/32 = ~47 % done, as far as the tests go.
+//	_testSet = [NSSet setWithArray:@[@"BCLR 0122"]];
 }
 
 - (void)testAll {
diff --git a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
index b2c66b981..294f9dce8 100644
--- a/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
+++ b/Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
@@ -817,7 +817,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 		//
 		BeginState(FetchProgramCounterIndirectWithDisplacement_bw):
 			effective_address_[next_operand_] =
-				instruction_address_.l + 2 +
+				program_counter_.l - 2 +
 				int16_t(prefetch_.w);
 			SetDataAddress(effective_address_[next_operand_]);
 
@@ -827,7 +827,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 
 		BeginState(FetchProgramCounterIndirectWithDisplacement_l):
 			effective_address_[next_operand_] =
-				instruction_address_.l + 2 +
+				program_counter_.l - 2 +
 				int16_t(prefetch_.w);
 			SetDataAddress(effective_address_[next_operand_]);
 
@@ -871,7 +871,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 		// ProgramCounterIndirectWithIndex8bitDisplacement
 		//
 		BeginState(FetchProgramCounterIndirectWithIndex8bitDisplacement_bw):
-			effective_address_[next_operand_] = d8Xn(instruction_address_.l + 2);
+			effective_address_[next_operand_] = d8Xn(program_counter_.l - 2);
 			SetDataAddress(effective_address_[next_operand_]);
 
 			IdleBus(1);								// n
@@ -880,7 +880,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
 		MoveToNextOperand(FetchOperand_bw);
 
 		BeginState(FetchProgramCounterIndirectWithIndex8bitDisplacement_l):
-			effective_address_[next_operand_] = d8Xn(instruction_address_.l + 2);;
+			effective_address_[next_operand_] = d8Xn(program_counter_.l - 2);;
 			SetDataAddress(effective_address_[next_operand_]);
 
 			IdleBus(1);								// n