Fixed fieldset issues