[FIX] Collection sorting