Fix AE support.