fixed a bug
Merge branch 'bugfix'