Improving stop handling