Fixed stat tracking