Fix initial sort