diff --git a/vpr/src/device/rr_graph_builder.h b/vpr/src/device/rr_graph_builder.h
index aa6fa17ea65..fda204eb86f 100644
--- a/vpr/src/device/rr_graph_builder.h
+++ b/vpr/src/device/rr_graph_builder.h
@@ -145,6 +145,11 @@ class RRGraphBuilder {
         node_storage_.remap_rr_node_switch_indices(switch_fanin);
     }
 
+    /** @brief Marks that edge switch values are rr switch indicies*/
+    inline void mark_edges_as_rr_switch_ids() {
+        node_storage_.mark_edges_as_rr_switch_ids();
+    }
+
     /** @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_uxsdcxx_serializer.h b/vpr/src/route/rr_graph_uxsdcxx_serializer.h
index 5243ae0237b..9ec0ae5593d 100644
--- a/vpr/src/route/rr_graph_uxsdcxx_serializer.h
+++ b/vpr/src/route/rr_graph_uxsdcxx_serializer.h
@@ -958,7 +958,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         // Partition the rr graph edges for efficient access to
         // configurable/non-configurable edge subsets. Must be done after RR
         // switches have been allocated.
-        rr_nodes_->mark_edges_as_rr_switch_ids();
+        rr_graph_builder_->mark_edges_as_rr_switch_ids();
         rr_nodes_->partition_edges();
 
         for (int source_node = 0; source_node < (ssize_t)rr_nodes_->size(); ++source_node) {