Fixed bug with multiple selection