diff --git a/vpr/src/device/rr_graph_builder.h b/vpr/src/device/rr_graph_builder.h
index b47ef698d31..047e17b20ea 100644
--- a/vpr/src/device/rr_graph_builder.h
+++ b/vpr/src/device/rr_graph_builder.h
@@ -113,6 +113,11 @@ class RRGraphBuilder {
         node_storage_.add_node_side(id, new_side);
     }
 
+    /** @brief It maps arch_switch_inf indicies to rr_switch_inf indicies. */
+    inline void remap_rr_node_switch_indices(const t_arch_switch_fanin& switch_fanin) {
+        node_storage_.remap_rr_node_switch_indices(switch_fanin);
+    }
+
     /** @brief Counts the number of rr switches needed based on fan in to support mux
      * size dependent switch delays. */
     inline size_t count_rr_switches(
diff --git a/vpr/src/route/rr_graph.cpp b/vpr/src/route/rr_graph.cpp
index ec112a6345d..8fd1ba046f6 100644
--- a/vpr/src/route/rr_graph.cpp
+++ b/vpr/src/route/rr_graph.cpp
@@ -893,7 +893,7 @@ void load_rr_switch_from_arch_switch(int arch_switch_idx,
 static void remap_rr_node_switch_indices(const t_arch_switch_fanin& switch_fanin) {
     auto& device_ctx = g_vpr_ctx.mutable_device();
 
-    device_ctx.rr_nodes.remap_rr_node_switch_indices(switch_fanin);
+    device_ctx.rr_graph_builder.remap_rr_node_switch_indices(switch_fanin);
 }
 
 static void rr_graph_externals(const std::vector<t_segment_inf>& segment_inf,