Sort of fix stats
Still not how I want it, but at least it works