diff --git a/src/experiments/l4-sys/experiment.cc b/src/experiments/l4-sys/experiment.cc
index b42a54fb..08ccf1b9 100644
--- a/src/experiments/l4-sys/experiment.cc
+++ b/src/experiments/l4-sys/experiment.cc
@@ -202,7 +202,7 @@ bool L4SysExperiment::run() {
 
 		// now check if we want to add the instruction for fault injection
 		if (instrFilter != NULL &&
-				instrFilter->isValidInstr(curr_addr, simulator.getCurrentInstruction())) {
+				instrFilter->isValidInstr(curr_addr, calculateInstructionAddress())) {
 			accepted++;
 			TraceInstr new_instr;
 			new_instr.trigger_addr = curr_addr;