Issue #724