order sorting fix