Added a bit more protection for the highlights to keep persistent