thanks to aspeon for replicating this issue, and to account to comment for following up. I'll have a look in the next week or two and see if I can patch it without too much effort.
Update: I could not patch it without too much effort.
