Highlighting fix