Fix issue with sorting requirements