Attaching a simple patch Thanks Bogdan! I pushed those changes.
Marcel, if you're able to try testing from the repo, that would be great. Else it hopefully won't be too long before the next pretest (or, even more optimistically, the next release). -karl