Fixing the sync issues with AAI