duplicate fix which doesn't break XPath
Merge pull request #3001 from sebv/duplicate-field

Duplicate fix which doesn't break XPath