Fix Highlighting