CAAERS-7043, reapply Biju's fix