Patch for an Issue #724