[DF-3085] fix reives issues