#27 add picked value check