Fixed race condition affecting reset path.