Fixed defect 1908