Bug fix for highlighting.