SUG-383 : Duplicate fields bugfix