Proper fix for unicode sorting error