Fixed dupe bug (Issue #415)