Fix bug with Highlight class