diff --git a/himbaechel/uarch/gatemate/route_clock.cc b/himbaechel/uarch/gatemate/route_clock.cc
index 96a18a1f..9d432b4a 100644
--- a/himbaechel/uarch/gatemate/route_clock.cc
+++ b/himbaechel/uarch/gatemate/route_clock.cc
@@ -199,8 +199,10 @@ void GateMateImpl::route_clock()
                             continue;
                     }
                     backtrace[src] = uh;
-                    auto delay = ctx->getDelayNS(ctx->getPipDelay(uh).maxDelay() + ctx->getWireDelay(src).maxDelay() +
-                                                 ctx->getDelayEpsilon());
+                    //auto delay = ctx->getDelayNS(ctx->getPipDelay(uh).maxDelay() + ctx->getWireDelay(src).maxDelay() +
+                    //                             ctx->getDelayEpsilon());
+                    // Do not use actual delay, enough is to know number of passed pips
+                    auto delay = ctx->getDelayNS(ctx->getDelayEpsilon());
                     visit.push(QueuedWire(src, curr.delay + delay));
                 }
             }