Fixed !stop/!continue issue