Refactored after fixing defect DE398