Fixing bug causing dups