Fix pick client