Attempted fix for dupe bug