Fixed sort
Merge branch 'hotfix/fixed_sort'