Highlighting should be fixed