removed concurrency issue