Fix bug with highlighting