Fix aaa is the old aa, current aa is the old aa0. (Do not run afna)

That should fix #1849 and missing entry0 issue