fixed highlighting support