fixed selectionChange issues