[Highlighting] Fixed #147