Fixed concurrency again