Fix: the key is not passed to the picker