Fixed bugs - concurrency