No really. Let's fix the dupe bug.

For real this time.