Fixed the highlighting issue