Fix highlight issue