fixed bug2
Merge branch 'bugFix2'