client code fix