Could you try with the attached patch (you have to remake Emacs).