Small Highlighting Bug Fix