Fixing Routing Issue with AA