fix little
Merge branch 'hotfix/task006'