concurrency issue fixed