fixed bug
Merge branch 'hotfix/2.2.4'