This seemed to work. However, this also seems to be a pretty big unfixed bug. Makes me wonder if there are other unfixed but unseen bugs...
Anyway, thanks for your solution.
