Bug fix (related to AISAB-107).