Fix service launch issue