issue #20266: Be more forgiving.