Fix client code