Cb 2671

Resolved concurrency issues