Fixed Client class reference