Fix the builder demo, Fix #77.