Fixed dupe bug