Fixed an issue on Highlighter, now works fine.