[DF-1056] Fixed