Stop more cleanly