Modify highlight check