Fix highlight method