Temporary workaround for highlighter mode