Fix more sorting
Fix more sorting 2