Concurrency fix