Highlighter hotfix