Did you forget to fix this race or did I miss it? (or maybe I'm not looking at the right version of the patch...)