Fixed a bug
Merge branch 'hotfix/bugfix1'