Issue #687