form-builder fix