Kindly pointed out by a generous tester.  Thank you.

(cherry picked from commit 0ce997d0)
(cherry picked from commit 29153230)