Issue #732