Updating to latest templatebuilder. Resolved #70.