I have a fix, some tests and it will be soon in git