Fixed a problem with multiple stops.