Fix for PR 19261: