fixed an issue with duplicate field names