fix the highlighting issue