Created attachment 113617 [details] [review]
fix 1/2

The attaches patches should fix the issue, but I would still like to get the
output of the debugging patch in comment 15 so that I can fine tune things if
possible.