diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index 2644cf3306d1faa7c842edb1d1484907d308e5ee..7dfbded7d854dc41b97060b1331a33ae8010a3e5 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -386,7 +386,7 @@ public class TunnelDispatcher implements Service {
      *
      */
     public void dispatch(TunnelGatewayMessage msg) {
-        long before = System.currentTimeMillis();
+        long before = _context.clock().now();
         TunnelGateway gw = _inboundGateways.get(msg.getTunnelId());
         if (gw != null) {
             if (_log.shouldLog(Log.DEBUG))
@@ -423,7 +423,7 @@ public class TunnelDispatcher implements Service {
                            + " existing = " + _inboundGateways.size(), new Exception("source"));
         }
         
-        long dispatchTime = System.currentTimeMillis() - before;
+        long dispatchTime = _context.clock().now() - before;
         
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Dispatch in gw time: " + dispatchTime + " gateway? " + gw);