Fixing defect #12