Fixing dupe bug