Address race condition