Make aa enforce work
Merge pull request #1182 from edx/e0d/fix-aa

Make aa enforce work