Issue #866