FIX: Trains would sometimes over-run signals when waypoints were in their route.