Added temp fix for fire