for real fixed selectionChange issues