Concurrency issue at launch fix