bug fix on selection.