Fix issue with stats rolling over