Merge pull request #3188 from popcornmix/sort_crash