Fix an issue that could cause QC to hang momentarily on launch