Fixed dupe bugs