Fixed service provider bug