You just saved my day. Thank you so much (yes, this is an issue since I can not find another way to contact you).
There're still some cases where the graph is broken, but it's not so important for my case.
Anyway, let me send you beer-money or something.
Thanks!