Trying to fix issues caused by async exec