Fix issue with wrapping stats