Fix the issue with AE support

Quick fix for AE