[FIX] fix the AAD Ib & AAM Ib bugs.