Fix sort order #34