Fixed highliting issue.