Possible fix for sorting issue.