Fix Service Provider bug