some fixes , issue #1080 the problem is not fixed, but we stopped using ...

...the functions since they're not really needed