fix for defect D2418