fixed issue where associations became duplicates
Merge pull request #1 from fieg/fix-duplicates

fixed issue where associations became duplicates