Update to fix concurrency bug