Repairing form builder (part 1)