Fixed HeatWave Bug