Stefan Kangas <stefankangas@gmail.com> writes:

> Mohsin Kaleem <mohkale@kisara.moe> writes:
>
>> Gerd Möllmann <gerd.moellmann@gmail.com> writes:
>>
>>> Would you perhaps have the time to prepare a patch that fixes this?
>>
>> I'm a bit swamped atm but could try prepping something in the next few
>> weeks. Hopefully shouldn't be too big of a change :-).
>
> Did you make any progress here?

AFAICT, the attached patch fixes this.