Fix bug with selectValue