Fix bug in Client when instanciating the picker