Avoid race condition too