duplicate field fix
Merge pull request #2988 from sebv/duplicate-field

Duplicate field fix