Fixed to use EnergyMeasure