Fixed stats calculation