Patch has been emailed to ubq323. Here is the code: https://paste.sr.ht/~arcade/734c77fe61facc0a0fa6b63d2278c389ce2dbd28