replace FieldList with FieldSet to fix #41