Fixed Concurrency Issues.