fieldset; correction needed after rebase