Another concurrency fix