avoid doing the client lookup twice