Fixed duplication glitch. Closes #1