FIx for AETVRD-1815