fixed the multiple selection issue