Fixed catastrophic fire problems