Hi
Would you be able to confirm that the attached patch fixes your issue as well?
Yes it does.
Thank you for your work, Valentin