Fixed for defect #1513