Dodging another race condition