First attempt of fixing concurrency