This should solve the concurrency problem