Fix client factory.