Issue #747