#58 - This improves the sorting.