lionelsaintecluque

I faced the bug and I applied the patch proposed above (PR#358). It resolves the issue and does not causes unwanted behaviour.