Multiselection fix