Fix highlight