bug is fixed
Merge branch 'bugfix'