Something went wrong with last commit, again fixing bug in output_energy