fixed onSelected and onDeselected calls