Fix for defect ASM-1030