Fix more sorting 4