fix for defect 71024