Bug/sort issue fixed