Fix to highlighting