Fixed onSelected callback