Fix bug when there is no fieldset