DF-4425 fixed