#8144163488615 more statistics and fix bug