Fix for the sort