Fix: compatibility with form-builder