Keep trying to fix concurrency bug