Possibly fix the dupe bug