Fix statistic collection