Fixing stat tracking