change sorting
fix sorting