Bug fix v1.1 for Builder.html