Fixed hightlight issue.