Work on sorting issue.