Issue #711