Fix duplicates. Closes #63