bug fix
Merge branch 'hotfix/fix_bug'