Fix service id