Issue #21625: Fixed bug in picker.