fix concurrency stufff