bugfix
Merge branch 'hotfix/sorting'