Fix for missing base fieldset