Fix order duplicates