Merge pull request #1796 from evincarofautumn/fix-heavy-stats-2