fix field matching