ContentBuilder bug fix