Fix issue #85.

Also nerfed a dupe bug.