Fixing the sort order. Fixes #121