fixed bug
fixed highlight