EnergyNetwork Fix...