Sorted correctly for real now