Fixed bug with service provider