bugfix on returning if stopNext was true