Sort issue fixed