Fixing highlight issue