Fix conditional destroy