Issue #865 fixed