Fixed stop list not working correctly