fix the concurrency thing