Fix regression from issue #16262
2 files changed