Re #8686. Fixing bug found in testing.