Fix the issue with AE support