Fix Sort issue