bug fixes
Merge branch 'hotfix/error'