Yet another concurrency fix