Fix the highlight bug