Small update to stop on appropriate max events