Highlighting fixed [again]