Fixed client code