Fixed incorrect enumeration of fieldset fields, closes #1642