[DF-926] Fixed