#97 fixed sort order