Fixed Highlighting bug

* For real this time