Fixed bug in highlighting