Fix another race condition.... (yes, got it!)