Defect resolution