Issue #742