Fix highlighting more