Should fix problem with dupes