Fix service scope