Better burn handling