Fixed extra space highlighting