Bug fix + Optimization

Fix bug for gameStat detection