fix hightlight issue