issue #18917: two bugfixes