I'm not sure about this solution to the issue we discussed, but I don't have any concrete alternatives without playing with the code. So I'll try to look at it in the next few days.