Fixing average comparisons. Closes #35