aae bug fix