Change to rvent a possible race condition.