Fix client with multiple services