diff --git a/himbaechel/uarch/gatemate/gatemate.cc b/himbaechel/uarch/gatemate/gatemate.cc
index c4f4f80d..71ab1df2 100644
--- a/himbaechel/uarch/gatemate/gatemate.cc
+++ b/himbaechel/uarch/gatemate/gatemate.cc
@@ -223,19 +223,21 @@ bool GateMateImpl::getClusterPlacement(ClusterId cluster, BelId root_bel,
 
 void GateMateImpl::prePlace() { assign_cell_info(); }
 
-void GateMateImpl::postPlace() { repack(); }
+void GateMateImpl::postPlace()
+{
+    repack();
+    ctx->assignArchInfo();
+}
 
 void GateMateImpl::preRoute()
 {
-    ctx->assignArchInfo();
     route_mult();
     route_clock();
+    ctx->assignArchInfo();
 }
 
 void GateMateImpl::postRoute()
 {
-    ctx->assignArchInfo();
-
     const ArchArgs &args = ctx->args;
     if (args.options.count("out")) {
         write_bitstream(args.device, args.options.at("out"));