Fixed bug 1458
Fix defect 1458