fix sorting;