Defect from refactoring