Try to improve performance in StatisticScreen