I wonder if this should be moved inside the fieldset