Fix more sorting 3