Issue #781