hotfix bug 1
Merge branch 'hotfix/bug_1'