Fix hilighting