add AAE guard