Making the same change in the client code, too.