#80 Fix statistics