Fix: Sort before map