Fix highlighting