Fixed the sorting fix