@finnsky: I tried to apply the patches mentioned in #50 and #51, but both th...