better handling of stop.update