fix for unexpected fields