[WIP] Sort order fix #94

Close #94