remove some conditions on stopped()