Order sorting fixed