Handle stopping better