Find bug with highlighting partly fixed...