Fix for defect #37

Fix for defect #37