Additional fix for highlighting bug.