nicer stop handling