More on fixing the highlighting