fix the highlight bug