Longer fix was done in PR #124