Fix to present correct averages