Fixed issue with concurrency