fixed highlight issue