Fix duplicate selection