AAI: addition to 2adb14c1db52d4ca741c093bb3d9ac4691afed34