Added duplicate checking closes #1697