[DF-1043] Fixed