fix bugs
Merge branch 'hotfix/fix_bugs'

* hotfix/fix_bugs:
  fix bugs