BUG: Fixed stats issue