code review: fix case of picker trying to pick itself