Fix Highlighting again