Concurrency fix, variable rename