Fix highlightnning