TAP-2024, fix sorting