Bugfixfix for concurrent 6