Fix sort order