Issue #704