Yet another try to sort everything out with sorting.