Fixing highlight behavior.