fix for improving concurrency