More defect resolution