Bug fix for multiple selection