KAZOO-2136 dealing with concurrency