issue #21684: bugfix