Issue #909 fixed