Fixed missed highlighting