Last minute LD panic fix