remove duplicate override, correct FieldMap