[DF-820] review fixing