Hmm, I think I misunderstood what was going on - I think by luck it looked like it worked in the case I tested (I had take the fix from #51). I'll look for a better solution.