Avoid more race conditions