[DF-1175] review fixing