Fix the ridiculous defect!!!