On 2020-06-27 08:39, Hrvoje Zeba wrote:
> Any suggestions?

How about the two attached (untested) patches?

Thanks,

Bart.