Fix a race between multiple concurrent selections