Stat bug fix #1