Fixed energy source buffer issue