Fix bug on highlighting