bugfixes
Merge branch 'hotfix'