Fix problem with duplicate field names