fix remainder of #4007