Fixed Bug: Highlight Flickering