Close AAI-2618 Issue