Fix the ordering for averages