Added picker, but introduced bug