fix #434
Merge remote-tracking branch 'origin/434-stats-page-bug'