Fix for defect #12