Fixed a duplication issue with additional fields