First try to fix concurrency issues