Few more boolean fix
boolean fix
ClearBuffer()
Merge pull request #3170 from raven02/patch-17

Few more boolean fix