Fixed defect D-08643