Fixed text color highlight bug