Fix for AEWA ammap