DF-2664 fixed according to review