fixed the highlight issue