Fix highlight AP bug