Some fix for concurrency fix