Issue #740