Fix the serviceprovider