Suggested fix for Service Provider errors