#13 fixed order's order logic