Issue #681