fix bug
Merge branch 'bugFix'