Highlighter fix