Second fix for dupe bug.