Fix the highlight issues