fix non-stopping bug