Fix AAE crash