Fixed defect TODO-122