Fix for energysource issue
Merge it