HOTFIX for concurrency problems