Stat collect improve and fix