[DF-927] Fixed