Energy Bill 'should be changed'