Correct the race condition in the standard selector as well