Correct conditional fieldset issue