[DF-2645] Fixed