fix for defect 7847