Fix failing concurrency tests thanks to @tim-kos