Bugfix: provisional bugfix for concurrency problem