Issue #19722 doh!