Fix multiple instances of fields being added. Closes #37.