Fix for AAIA-275