second bugfix
Merge branch 'bugfix'