Fix issue with scaling average, min, and max metrics. Closes #1692.
Make change for readability
Merge pull request #1819 from lukasolson/issue-1692

Fix issue with scaling average, min, and max metrics. Closes #1692.