Trying to resolve highlight issue