fix stop bugs