Quick fix to get Highlighting right