Refs #151 - Fix service provider.