New attempt to fix stats