sort issues fix