Fix multiple stops