Simplify unstoppable again (#950)