Re #8554. Fixed bug found in testing.