fix highlight issue