Fixed Highlighting.