fixing multiple selection problems