Fixing Concurrency Issue