Fix highlighting for null characters