Ported stats improvement from 4.8