Improved highlight preventing performance.