Fixed issue with unregistered highlighting