Brute force concurrency fix