bufFix
Merge branch 'bugFix'