Issue #682 fixed