Fixed concurrency issue