Fixed highlight issue