Service provider bugfix