Fixed issue sorting