Fixed Highlighting bug