Fix a bug with multiple selection