Fix atomicity warning from the latest change