Fixed clearing button selected state