change logic in defect.goto