Fix highlight issue #129