Fixed bug with clearing of highlighting.