Fix critical dupe issue
Merge pull request #6 from mbax/dupe-fix

Fix critical dupe issue