Proper fix for stats ordering