Issue #727