address comments on #8238