issue #21684: more on invoice