Fixed bug with hilighting