Merge pull request #1795 from evincarofautumn/fix-heavy-stats