fixed bug
Merge branch 'HOTFIX-3'