diff --git a/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv b/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv
index e60d8aa..1535a39 100644
--- a/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv
+++ b/src_Core/RISCY_OOO/procs/RV64G_OOO/RenameStage.bsv
@@ -677,7 +677,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
                             imm: validValue(dInst.imm),
                             ldstq_tag: lsqTag,
                             cap_checks: dInst.capChecks,
-                            cap_mode: getFlags(pc)==1
+                            cap_mode: dInst.execFunc.Mem.reg_bounds
                         },
                         regs: phy_regs,
                         tag: inst_tag,
@@ -1017,7 +1017,7 @@ module mkRenameStage#(RenameInput inIfc)(RenameStage);
                                             imm: validValue(dInst.imm),
                                             ldstq_tag: lsqTag,
                                             cap_checks: dInst.capChecks,
-                                            cap_mode: getFlags(pc)==1
+                                            cap_mode: dInst.execFunc.Mem.reg_bounds
                                         },
                                         regs: phy_regs,
                                         tag: inst_tag,