[minor] Address bluong's feedback for RR #943