26748 - fixed selected state