minor (#4106 and #4107)