diff --git a/src_Testbench/SoC/SoC_Map.bsv b/src_Testbench/SoC/SoC_Map.bsv
index 5b85527..2ce4e70 100644
--- a/src_Testbench/SoC/SoC_Map.bsv
+++ b/src_Testbench/SoC/SoC_Map.bsv
@@ -172,7 +172,8 @@ module mkSoC_Map (SoC_Map_IFC);
    // (Caches need this information to cache these addresses.)
 
    function Bool fn_is_mem_addr (Fabric_Addr addr);
-     return (inRange(tcm_addr_range, addr));
+     return (  inRange(mem0_controller_addr_range, addr)
+	          || inRange(tcm_addr_range, addr));
    endfunction
 
    // ----------------------------------------------------------------
@@ -182,7 +183,6 @@ module mkSoC_Map (SoC_Map_IFC);
 
    function Bool fn_is_IO_addr (Fabric_Addr addr);
       return (  inRange(boot_rom_addr_range, addr)
-             || inRange(mem0_controller_addr_range, addr)
              || inRange(near_mem_io_addr_range, addr)
              || inRange(plic_addr_range, addr)
              || inRange(uart0_addr_range, addr));