Energy Calc Fix