form-builder bugfix