> tried, but got a crash in different place instead.

Interesting.  Could you try the more invasive patch I attached?  I have
no idea what it could break, so please don't do any important work with
it.

martin