Service provider fix