fixed to work rank
Merge branch 'hotfix-2224'