bugfix4
Merge branch 'hotfix/bug4'