Fix service provider