Switch to using FastVectorHighlighter as it seems to solve both #284 and #248