Fix g_energy average/RMSD bug