diff --git a/core/src/main/scala/ru/itclover/tsp/core/aggregators/WaitPattern.scala b/core/src/main/scala/ru/itclover/tsp/core/aggregators/WaitPattern.scala
index 6e42e112..87d1c34c 100644
--- a/core/src/main/scala/ru/itclover/tsp/core/aggregators/WaitPattern.scala
+++ b/core/src/main/scala/ru/itclover/tsp/core/aggregators/WaitPattern.scala
@@ -63,7 +63,7 @@ case class WaitAccumState[T](windowQueue: m.Queue[(Idx, Time)], lastFail: Boolea
       val waitStart = if (lastTime._2.toMillis != 0 && Try(outputs.head._2.plus(window) < outputs.last._2).getOrElse(false)) {
         outputs.headOption
       } else {
-        Some(lastTime)
+        Some(cleanedWindowQueue.lastOption.getOrElse(lastTime))
       }
       val waitEnd = outputs.lastOption