Van de Bugger - 2022-09-13

I prepared a patch which solves this issue. See attachment.