Highlight fix