fix duplicate field names