Fix concurrency... yeah, probably still broken.