[DF-1009] Fixed