Fixed better stats handling