Fixing Defect