diff --git a/src/Core/Datapath.sv b/src/Core/Datapath.sv
index 2519ac3..f00ca90 100644
--- a/src/Core/Datapath.sv
+++ b/src/Core/Datapath.sv
@@ -497,11 +497,11 @@ module Datapath (
                   // TODO: CACHE
                      | D.IA.MCtrl1.TLBR & D.IB.MCtrl0.C0W
                      | D.IA.MCtrl1.TLBP & D.IB.MCtrl0.C0W
-                     | D.IA.MCtrl1.TLBR & D.IB.MCtrl0.RW    & D.IB.MCtrl0.C0D == C0_ENTRYHI  & D.IB.MCtrl0.RS0 == C0
-                     | D.IA.MCtrl1.TLBR & D.IB.MCtrl0.RW    & D.IB.MCtrl0.C0D == C0_ENTRYLO0 & D.IB.MCtrl0.RS0 == C0
-                     | D.IA.MCtrl1.TLBR & D.IB.MCtrl0.RW    & D.IB.MCtrl0.C0D == C0_ENTRYLO1 & D.IB.MCtrl0.RS0 == C0
-                     | D.IA.MCtrl1.TLBR & D.IB.MCtrl0.RW    & D.IB.MCtrl0.C0D == C0_PAGEMASK & D.IB.MCtrl0.RS0 == C0
-                     | D.IA.MCtrl1.TLBP & D.IB.MCtrl0.RW    & D.IB.MCtrl0.C0D == C0_INDEX    & D.IB.MCtrl0.RS0 == C0
+                     | D.IA.MCtrl1.TLBR & D.IB.WCtrl.RW     & D.IB.MCtrl0.C0D == C0_ENTRYHI  & D.IB.MCtrl0.RS0 == C0
+                     | D.IA.MCtrl1.TLBR & D.IB.WCtrl.RW     & D.IB.MCtrl0.C0D == C0_ENTRYLO0 & D.IB.MCtrl0.RS0 == C0
+                     | D.IA.MCtrl1.TLBR & D.IB.WCtrl.RW     & D.IB.MCtrl0.C0D == C0_ENTRYLO1 & D.IB.MCtrl0.RS0 == C0
+                     | D.IA.MCtrl1.TLBR & D.IB.WCtrl.RW     & D.IB.MCtrl0.C0D == C0_PAGEMASK & D.IB.MCtrl0.RS0 == C0
+                     | D.IA.MCtrl1.TLBP & D.IB.WCtrl.RW     & D.IB.MCtrl0.C0D == C0_INDEX    & D.IB.MCtrl0.RS0 == C0
                 // Hazards Related to Exceptions or Interrupts
                      | D.IA.MCtrl0.C0W  & D.IB.ERET         & D.IA.MCtrl0.C0D == C0_EPC
                 ;