Fixed SelectedItem Event handling