[DF-1033] Fixed